diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-25 10:22:53 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 01:54:55 -0500 |
commit | cc372d84e231ea9f574ef5de9a7ab39dee5a021d (patch) | |
tree | 7fa18bfa625f29778a1eee6697c243e0c7ea3bf6 | |
parent | 33ca237f80555cde41c17682991a2b58d2f14da5 (diff) |
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>
-rw-r--r-- | drivers/video/omap2/dss/apply.c | 3 |
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) | |||
410 | ovl = omap_dss_get_overlay(i); | 410 | ovl = omap_dss_get_overlay(i); |
411 | op = get_ovl_priv(ovl); | 411 | op = get_ovl_priv(ovl); |
412 | 412 | ||
413 | if (!op->enabled) | ||
414 | continue; | ||
415 | |||
416 | mp = get_mgr_priv(ovl->manager); | 413 | mp = get_mgr_priv(ovl->manager); |
417 | 414 | ||
418 | if (!mp->enabled) | 415 | if (!mp->enabled) |