]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/omap: DMM: Check for DMM readiness after successful transaction commit
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Fri, 29 Sep 2017 11:49:49 +0000 (14:49 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 19 Dec 2017 08:32:00 +0000 (10:32 +0200)
Check the status of the DMM engine after it is reported that the
transaction was completed as in rare cases the engine might not reached a
working state.

The wait_status() will print information in case the DMM is not reached the
expected state and the dmm_txn_commit() will return with an error code to
make sure that we are not continuing with a broken setup.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c

index d7f2940cb596311bda01ede160d817229b484742..d348e20fe10cacd1e07e4a415e2ab8bebc4b216c 100644 (file)
@@ -311,7 +311,12 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait)
                                msecs_to_jiffies(100))) {
                        dev_err(dmm->dev, "timed out waiting for done\n");
                        ret = -ETIMEDOUT;
+                       goto cleanup;
                }
+
+               /* Check the engine status before continue */
+               ret = wait_status(engine, DMM_PATSTATUS_READY |
+                                 DMM_PATSTATUS_VALID | DMM_PATSTATUS_DONE);
        }
 
 cleanup: