summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-11-25 17:22:53 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-12-02 08:54:55 +0200
commitcc372d84e231ea9f574ef5de9a7ab39dee5a021d (patch)
tree7fa18bfa625f29778a1eee6697c243e0c7ea3bf6 /drivers/video
parent33ca237f80555cde41c17682991a2b58d2f14da5 (diff)
downloadblackbird-op-linux-cc372d84e231ea9f574ef5de9a7ab39dee5a021d.tar.gz
blackbird-op-linux-cc372d84e231ea9f574ef5de9a7ab39dee5a021d.zip
OMAPDSS: APPLY: fix extra_info_update_ongoing
extra_info_update_ongoing() skipped checks for overlays that were marked as disabled. This doesn't work, as the enable status of an overlay is in the extra_info group, and thus extra_info_update_ongoing() reports false when we are disabling an overlay. This causes wait_pending_extra_info_updates() to not wait for the ongoing overlay disable. This patch changes extra_info_update_ongoing() to check the state of overlays marked as disabled. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/apply.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 614592c7a75c..5d205ada30de 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -410,9 +410,6 @@ static bool extra_info_update_ongoing(void)
ovl = omap_dss_get_overlay(i);
op = get_ovl_priv(ovl);
- if (!op->enabled)
- continue;
-
mp = get_mgr_priv(ovl->manager);
if (!mp->enabled)
OpenPOWER on IntegriCloud