---

yaml --- r: 284917 b: refs/heads/master c: be72917 h: refs/heads/master i: 284915: c94ac88 v: v3
git-mirror · Dec 2, 2011 · 855885e · 855885e
1 parent 5231fbe
commit 855885e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7797c6da64852b06b585b7eca8d3f657bfc9fa47
+refs/heads/master: be729178f0e0f31ab14b42b3fe5d6b4463fbeb3a
diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c
@@ -657,10 +657,12 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 void dss_mgr_enable(struct omap_overlay_manager *mgr)
 {
 	dispc_mgr_enable(mgr->id, true);
+	mgr->enabled = true;
 }
 
 void dss_mgr_disable(struct omap_overlay_manager *mgr)
 {
 	dispc_mgr_enable(mgr->id, false);
+	mgr->enabled = false;
 }
 
diff --git a/trunk/include/video/omapdss.h b/trunk/include/video/omapdss.h
@@ -432,6 +432,8 @@ struct omap_overlay_manager {
 	struct omap_dss_device *device;
 	struct omap_overlay_manager_info info;
 
+	bool enabled;
+
 	bool device_changed;
 	/* if true, info has been changed but not applied() yet */
 	bool info_dirty;