Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a74b2605 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Tomi Valkeinen
Browse files

OMAP: DSS2: Make wait_for_go() succeed for disabled displays 



When the display is not active make the wait_for_go() functions return
immediately.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@nokia.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 825f50b1

drivers/video/omap2/dss/manager.c

+5 −2
Original line number Diff line number Diff line
@@ -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) {
@@ -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;