浏览代码

OMAPDSS: apply affects only one overlay manager

omap_dss_mgr_apply currently applies settings to all overlays and
overlay managers. The reason for this was to support cases where
configuration changes affecting multiple managers are made. However, the
current code doesn't support changing such configurations, so the
functionality is not needed.

Change the apply to affect only the manager given as an argument, and
the overlays attached to that manager.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tomi Valkeinen 14 年之前
父节点
当前提交
d2bbb9bbd1
共有 1 个文件被更改,包括 12 次插入7 次删除
  1. 12 7
      drivers/video/omap2/dss/manager.c

+ 12 - 7
drivers/video/omap2/dss/manager.c

@@ -1114,23 +1114,28 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 	spin_lock_irqsave(&dss_cache.lock, flags);
 
 	/* Configure overlays */
-	for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+	for (i = 0; i < mgr->num_overlays; ++i) {
 		struct omap_overlay *ovl;
 
-		ovl = omap_dss_get_overlay(i);
+		ovl = mgr->overlays[i];
+
+		if (ovl->manager != mgr)
+			continue;
 
 		omap_dss_mgr_apply_ovl(ovl);
 	}
 
-	/* Configure managers */
-	list_for_each_entry(mgr, &manager_list, list)
-		omap_dss_mgr_apply_mgr(mgr);
+	/* Configure manager */
+	omap_dss_mgr_apply_mgr(mgr);
 
 	/* Configure overlay fifos */
-	for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+	for (i = 0; i < mgr->num_overlays; ++i) {
 		struct omap_overlay *ovl;
 
-		ovl = omap_dss_get_overlay(i);
+		ovl = mgr->overlays[i];
+
+		if (ovl->manager != mgr)
+			continue;
 
 		omap_dss_mgr_apply_ovl_fifos(ovl);
 	}