aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-11-25 10:35:35 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-12-02 01:54:57 -0500
commit153b6e7357778267e6914f2370a059e79a751371 (patch)
tree96577f5a5a1fa55f46f3b514339fb4d9a6605fd4
parent3ab15b2aa70369e0360f12e35e47bca1a269138b (diff)
OMAPDSS: APPLY: cleanup extra_info_update_ongoing
Trivial cleanup for extra_info_update_ongoing(), making the function a bit cleaner. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/omap2/dss/apply.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index f54c17f849b7..b6e608386219 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -426,7 +426,6 @@ static bool extra_info_update_ongoing(void)
426 struct omap_overlay *ovl; 426 struct omap_overlay *ovl;
427 struct mgr_priv_data *mp; 427 struct mgr_priv_data *mp;
428 int i; 428 int i;
429 bool eid;
430 429
431 for (i = 0; i < num_ovls; ++i) { 430 for (i = 0; i < num_ovls; ++i) {
432 ovl = omap_dss_get_overlay(i); 431 ovl = omap_dss_get_overlay(i);
@@ -437,15 +436,11 @@ static bool extra_info_update_ongoing(void)
437 if (!mp->enabled) 436 if (!mp->enabled)
438 continue; 437 continue;
439 438
440 eid = op->extra_info_dirty || op->shadow_extra_info_dirty; 439 if (!mp->updating)
441
442 if (!eid)
443 continue;
444
445 if (ovl_manual_update(ovl) && !mp->updating)
446 continue; 440 continue;
447 441
448 return true; 442 if (op->extra_info_dirty || op->shadow_extra_info_dirty)
443 return true;
449 } 444 }
450 445
451 return false; 446 return false;