diff options
| author |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-10-16 12:09:05 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-10-22 11:07:08 +0300 |
| commit | 22500c19e6dc1a7c897323eff040364289bce0b7 (patch) | |
| tree | 3084a185bfa58f6b103d2397a62d87c792dbf6b8 /drivers/video | |
| parent | OMAPFB: remove __exit annotation (diff) | |
| download | linux-dev-22500c19e6dc1a7c897323eff040364289bce0b7.tar.xz linux-dev-22500c19e6dc1a7c897323eff040364289bce0b7.zip | |
OMAPDSS: apply: wait pending updates on manager disable
We should wait for any pending updates when an overlay manager is
about to be disabled, because the updates will never be finished if the
manager is disabled too early.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/apply.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/apply.c b/drivers/video/fbdev/omap2/dss/apply.c index 0a0b084ce65d..663ccc3bf4e5 100644 --- a/drivers/video/fbdev/omap2/dss/apply.c +++ b/drivers/video/fbdev/omap2/dss/apply.c @@ -1132,6 +1132,8 @@ static void dss_mgr_disable_compat(struct omap_overlay_manager *mgr) if (!mp->enabled) goto out; + wait_pending_extra_info_updates(); + if (!mgr_manual_update(mgr)) dispc_mgr_disable_sync(mgr->id); |