From 45c891044840303541ce4875e78af05a1a59870c Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 27 Oct 2011 13:11:31 +0300 Subject: [PATCH] --- yaml --- r: 284897 b: refs/heads/master c: 714ad3ac505bba711f961bb8013644c9d8fb486a h: refs/heads/master i: 284895: b561464be5bb681591b667a056f4488411e317c8 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/manager.c | 26 +------------------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 97f858ab7092..36e746c27f73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8754595796a45e88411b68005bc98310c8c6ae76 +refs/heads/master: 714ad3ac505bba711f961bb8013644c9d8fb486a diff --git a/trunk/drivers/video/omap2/dss/manager.c b/trunk/drivers/video/omap2/dss/manager.c index 6e63845cc7d7..1be5f47a2114 100644 --- a/trunk/drivers/video/omap2/dss/manager.c +++ b/trunk/drivers/video/omap2/dss/manager.c @@ -1313,8 +1313,6 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) struct manager_cache_data *mc; int i; struct omap_overlay *ovl; - int num_planes_enabled = 0; - bool use_fifomerge; unsigned long flags; int r; @@ -1347,11 +1345,8 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) continue; } - if (!ovl->info_dirty) { - if (oc->enabled) - ++num_planes_enabled; + if (!ovl->info_dirty) continue; - } dssdev = ovl->manager->device; @@ -1375,8 +1370,6 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) oc->channel = ovl->manager->id; oc->enabled = true; - - ++num_planes_enabled; } /* Configure managers */ @@ -1406,21 +1399,6 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE; } - /* XXX TODO: Try to get fifomerge working. The problem is that it - * affects both managers, not individually but at the same time. This - * means the change has to be well synchronized. I guess the proper way - * is to have a two step process for fifo merge: - * fifomerge enable: - * 1. disable other planes, leaving one plane enabled - * 2. wait until the planes are disabled on HW - * 3. config merged fifo thresholds, enable fifomerge - * fifomerge disable: - * 1. config unmerged fifo thresholds, disable fifomerge - * 2. wait until fifo changes are in HW - * 3. enable planes - */ - use_fifomerge = false; - /* Configure overlay fifos */ for (i = 0; i < omap_dss_get_num_overlays(); ++i) { struct omap_dss_device *dssdev; @@ -1436,8 +1414,6 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) dssdev = ovl->manager->device; size = dispc_ovl_get_fifo_size(ovl->id); - if (use_fifomerge) - size *= 3; burst_size = dispc_ovl_get_burst_size(ovl->id);