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

Commit 21e56f79 authored by Lajos Molnar's avatar Lajos Molnar Committed by Tomi Valkeinen
Browse files

OMAPDSS: MANAGER/APPLY: Add runtime_pm protection around wait_for_go/vsync functions 



If DSS suspends within the functions dss_mgr_wait_for_go(),
dss_mgr_wait_for_go_ovl() or dss_mgr_wait_for_vsync(). It may lose it's clock
and lead to a register access failure.

Request runtime_pm around these functions.

[archit@ti.com: Moved runtime_pm calls to wait_for_go/vsync functions rather
then calling them from omap_dispc_wait_for_irq_interruptible_timeout()]

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent c0c1cfcb

drivers/video/omap2/dss/apply.c

+12 −0
Original line number Diff line number Diff line
@@ -391,6 +391,10 @@ int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr) 
	if (mgr_manual_update(mgr))

		return 0;



	r = dispc_runtime_get();

	if (r)

		return r;



	irq = dispc_mgr_get_vsync_irq(mgr->id);



	mp = get_mgr_priv(mgr);
@@ -431,6 +435,8 @@ int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr) 
		}

	}



	dispc_runtime_put();



	return r;

}
@@ -454,6 +460,10 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl) 
	if (ovl_manual_update(ovl))

		return 0;



	r = dispc_runtime_get();

	if (r)

		return r;



	irq = dispc_mgr_get_vsync_irq(ovl->manager->id);



	op = get_ovl_priv(ovl);
@@ -494,6 +504,8 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl) 
		}

	}



	dispc_runtime_put();



	return r;

}

drivers/video/omap2/dss/manager.c

+11 −1
Original line number Diff line number Diff line
@@ -494,6 +494,11 @@ static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr) 
{

	unsigned long timeout = msecs_to_jiffies(500);

	u32 irq;

	int r;



	r = dispc_runtime_get();

	if (r)

		return r;



	if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC) {

		irq = DISPC_IRQ_EVSYNC_ODD;
@@ -505,7 +510,12 @@ static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr) 
		else

			irq = DISPC_IRQ_VSYNC2;

	}

	return omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);



	r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);



	dispc_runtime_put();



	return r;

}



int dss_init_overlay_managers(struct platform_device *pdev)