summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorSergey Kibrik <sergiikibrik@ti.com>2013-04-25 10:28:15 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-06-17 13:00:56 +0200
commit595470a7853848cb971d5ee3fed443b1e3aa0d1b (patch)
tree05e3a86e5e8a049080a7841acc8cf585f3d28196 /drivers/video/omap2
parentOMAPDSS: Remove kfree for memory allocated with devm_kzalloc (diff)
downloadlinux-595470a7853848cb971d5ee3fed443b1e3aa0d1b.tar.xz
linux-595470a7853848cb971d5ee3fed443b1e3aa0d1b.zip
OMAPDSS: gracefully disable overlay at error
Disable overlay via ovl->disable() interface, which will properly set flags in cache and GO bits for managers. This allows overlay user to re-enable it on next frame, thus recovering from FIFO underflows. Signed-off-by: Sergey Kibrik <sergiikibrik@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/dss/dispc-compat.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dispc-compat.c b/drivers/video/omap2/dss/dispc-compat.c
index 928884c9a0a9..83779c2b292a 100644
--- a/drivers/video/omap2/dss/dispc-compat.c
+++ b/drivers/video/omap2/dss/dispc-compat.c
@@ -360,8 +360,7 @@ static void dispc_error_worker(struct work_struct *work)
if (bit & errors) {
DSSERR("FIFO UNDERFLOW on %s, disabling the overlay\n",
ovl->name);
- dispc_ovl_enable(ovl->id, false);
- dispc_mgr_go(ovl->manager->id);
+ ovl->disable(ovl);
msleep(50);
}
}