Skip to content

Commit

Permalink
OMAPDSS: APPLY: skip enable/disable if already enabled/disabled
Browse files Browse the repository at this point in the history
Add checks to dss_mgr_enable, dss_mgr_disable, dss_ovl_enable,
dss_ovl_disable that check if the state is already the same as given in
the parameters, and exit if so.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Dec 2, 2011
1 parent 841c09c commit e4f7ad7
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions drivers/video/omap2/dss/apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

Expand All @@ -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);

Expand All @@ -760,6 +767,7 @@ void dss_mgr_disable(struct omap_overlay_manager *mgr)

spin_unlock_irqrestore(&data_lock, flags);

out:
mutex_unlock(&apply_lock);
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e4f7ad7

Please sign in to comment.