diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-04-28 14:01:32 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-07-02 15:58:06 +0300 |
| commit | 96cbd142310cc7281f94739b27d8e4c308d588c5 (patch) | |
| tree | 57b2b358ff2e6fa8c212946ccde672296c480854 | |
| parent | c423bc85097327fba71f9a831280d09b64bb62b6 (diff) | |
| download | op-kernel-dev-96cbd142310cc7281f94739b27d8e4c308d588c5.zip op-kernel-dev-96cbd142310cc7281f94739b27d8e4c308d588c5.tar.gz | |
drm/omap: increase DMM transaction timeout
The DMM driver uses a timeout of 1 ms to wait for DMM transaction to
finish. While DMM should always finish the operation within that time,
the timeout is rather strict. Small misbehavior of the system (e.g. an
irq taking too long) could trigger the timeout.
As the DMM is a critical piece of code for display memory management,
let's increase the timeout to 100 ms so that we are less likely to fail
a memory allocation in case of system misbehaviors. 100 ms is just a
guess of a reasonably large timeout. The HW should accomplish the task
in less than 1 ms.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c index f2daad8..7841970 100644 --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c @@ -285,7 +285,7 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) if (wait) { if (!wait_for_completion_timeout(&engine->compl, - msecs_to_jiffies(1))) { + msecs_to_jiffies(100))) { dev_err(dmm->dev, "timed out waiting for done\n"); ret = -ETIMEDOUT; } |
