From 6a4fe5673b7e1e7aaea2faf3f8284a9d900c1a95 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 16 Nov 2011 16:01:33 +0200 Subject: [PATCH] --- yaml --- r: 284952 b: refs/heads/master c: e4f7ad702ef271d2b0c03e9904b05f9bcbf0808b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/apply.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 902ddd8ed40e..1b36b1286bb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 841c09c7975c67fe7741564d98265de28a5764d0 +refs/heads/master: e4f7ad702ef271d2b0c03e9904b05f9bcbf0808b diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index ec2183721642..27d13bd9ed10 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -724,6 +724,9 @@ void dss_mgr_enable(struct omap_overlay_manager *mgr) mutex_lock(&apply_lock); + if (mp->enabled) + goto out; + spin_lock_irqsave(&data_lock, flags); mp->enabled = true; @@ -740,6 +743,7 @@ void dss_mgr_enable(struct omap_overlay_manager *mgr) if (!mgr_manual_update(mgr)) dispc_mgr_enable(mgr->id, true); +out: mutex_unlock(&apply_lock); } @@ -750,6 +754,9 @@ void dss_mgr_disable(struct omap_overlay_manager *mgr) mutex_lock(&apply_lock); + if (!mp->enabled) + goto out; + if (!mgr_manual_update(mgr)) dispc_mgr_enable(mgr->id, false); @@ -760,6 +767,7 @@ void dss_mgr_disable(struct omap_overlay_manager *mgr) spin_unlock_irqrestore(&data_lock, flags); +out: mutex_unlock(&apply_lock); } @@ -1005,6 +1013,11 @@ int dss_ovl_enable(struct omap_overlay *ovl) mutex_lock(&apply_lock); + if (op->enabled) { + r = 0; + goto err; + } + if (ovl->manager == NULL || ovl->manager->device == NULL) { r = -EINVAL; goto err; @@ -1036,6 +1049,11 @@ int dss_ovl_disable(struct omap_overlay *ovl) mutex_lock(&apply_lock); + if (!op->enabled) { + r = 0; + goto err; + } + if (ovl->manager == NULL || ovl->manager->device == NULL) { r = -EINVAL; goto err;