From 841c09c7975c67fe7741564d98265de28a5764d0 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 16 Nov 2011 15:25:53 +0200 Subject: OMAPDSS: APPLY: add dss_apply_ovl_enable() Add a helper function dss_apply_ovl_enable(), which is similar to the main apply() function: dss_apply_ovl_enable() applies the given overlay enable-status to ovl_priv_data, and sets the dirty flag. The difference between the helper function and the previous direct use of the fields is that the helper function will not do anything if the enable state is already the same as given in the parameter. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/apply.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 70154092d731..ec2183721642 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/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(); -- cgit v1.2.3