From 40b4aa9fa6612af6971f4476e069098cf0a058da Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 16 Nov 2011 15:25:53 +0200 Subject: [PATCH] --- yaml --- r: 284951 b: refs/heads/master c: 841c09c7975c67fe7741564d98265de28a5764d0 h: refs/heads/master i: 284949: 0d1a1ed1dfc3033f2df4f14495ccc7ba4764713e 284947: ae0d93126f2ff87f34cb620c282cf23c589cfe64 284943: d9f003b64f19c1cb75f7e1244bfaf16051088e85 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/apply.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2447b2494724..902ddd8ed40e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff4733dcf56480bebcd3801adde27213b893635d +refs/heads/master: 841c09c7975c67fe7741564d98265de28a5764d0 diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index 70154092d731..ec2183721642 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -646,6 +646,19 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) return r; } +static void dss_apply_ovl_enable(struct omap_overlay *ovl, bool enable) +{ + struct ovl_priv_data *op; + + op = get_ovl_priv(ovl); + + if (op->enabled == enable) + return; + + op->enabled = enable; + op->extra_info_dirty = true; +} + static void dss_ovl_setup_fifo(struct omap_overlay *ovl) { struct ovl_priv_data *op = get_ovl_priv(ovl); @@ -999,8 +1012,7 @@ int dss_ovl_enable(struct omap_overlay *ovl) spin_lock_irqsave(&data_lock, flags); - op->enabled = true; - op->extra_info_dirty = true; + dss_apply_ovl_enable(ovl, true); dss_ovl_setup_fifo(ovl); @@ -1031,8 +1043,7 @@ int dss_ovl_disable(struct omap_overlay *ovl) spin_lock_irqsave(&data_lock, flags); - op->enabled = false; - op->extra_info_dirty = true; + dss_apply_ovl_enable(ovl, false); dss_write_regs();