Skip to content

Commit

Permalink
OMAP: DSS2: Make wait_for_go() succeed for disabled displays
Browse files Browse the repository at this point in the history
When the display is not active make the wait_for_go() functions return
immediately.

Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
  • Loading branch information
Ville Syrjälä authored and Tomi Valkeinen committed Aug 3, 2010
1 parent 825f50b commit a74b260
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/video/omap2/dss/manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
int i;
struct omap_dss_device *dssdev = mgr->device;

if (!dssdev)
if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
return 0;

if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
Expand Down Expand Up @@ -596,11 +596,14 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
int r;
int i;

if (!ovl->manager || !ovl->manager->device)
if (!ovl->manager)
return 0;

dssdev = ovl->manager->device;

if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
return 0;

if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
channel = OMAP_DSS_CHANNEL_DIGIT;
Expand Down

0 comments on commit a74b260

Please sign in to comment.