diff options
Diffstat (limited to 'drivers/video/omap2/dss/apply.c')
-rw-r--r-- | drivers/video/omap2/dss/apply.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index eafa80846365..936571b7aace 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -648,7 +648,8 @@ void dss_mgr_enable(struct omap_overlay_manager *mgr) { mutex_lock(&apply_lock); - dispc_mgr_enable(mgr->id, true); + if (!mgr_manual_update(mgr)) + dispc_mgr_enable(mgr->id, true); mgr->enabled = true; mutex_unlock(&apply_lock); @@ -658,7 +659,8 @@ void dss_mgr_disable(struct omap_overlay_manager *mgr) { mutex_lock(&apply_lock); - dispc_mgr_enable(mgr->id, false); + if (!mgr_manual_update(mgr)) + dispc_mgr_enable(mgr->id, false); mgr->enabled = false; mutex_unlock(&apply_lock); |