summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/manager.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-08-16 12:56:19 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-09-30 16:16:19 +0300
commit8fa8031c542986746ed4dfbd1eb52358bc86000b (patch)
treec8d0190c274a9e4d86468936ce3e196746987237 /drivers/video/omap2/dss/manager.c
parent5e7850917fc213882d4e409634c526a8ff310e1e (diff)
downloadtalos-obmc-linux-8fa8031c542986746ed4dfbd1eb52358bc86000b.tar.gz
talos-obmc-linux-8fa8031c542986746ed4dfbd1eb52358bc86000b.zip
OMAP: DSS2: Handle manager change in apply
Currently when changing the manager of an overlay, set_manager() directly calls dispc to set the overlay's destination. Change this to be more in line with other overlay configurations, and this will also remove the need to have dispc clocks enabled when calling set_manager(). A new field is added to overlay struct, "manager_changed". This is similar to "display_changed" field in manager struct, and is used to inform apply that the manager has changed and thus write to the registers is needed. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/manager.c')
-rw-r--r--drivers/video/omap2/dss/manager.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 63674b054d35..a6a909ae8670 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -1338,6 +1338,11 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
oc = &dss_cache.overlay_cache[ovl->id];
+ if (ovl->manager_changed) {
+ ovl->manager_changed = false;
+ ovl->info_dirty = true;
+ }
+
if (!overlay_enabled(ovl)) {
if (oc->enabled) {
oc->enabled = false;
OpenPOWER on IntegriCloud