From be07dcd7e239a854ae92041b3eb17863062e52e4 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 21 Nov 2013 16:01:40 +0200 Subject: [PATCH] OMAPDSS: DISPC: fix context restore DISPC_MSTANDBY_CTRL register is used in the driver, but it's not restored in dispc_restore_context(), causing problems after resume. Instead of adding DISPC_MSTANDBY_CTRL to dispc_restore_context(), let's call _omap_dispc_initial_config() as the first thing in dispc_runtime_resume(). This will initialize the DISPC core registers properly, and will avoid similar issues in the future. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dispc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 533539e51cf5..0db46c0eac48 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -3740,6 +3740,8 @@ static int dispc_runtime_suspend(struct device *dev) static int dispc_runtime_resume(struct device *dev) { + _omap_dispc_initial_config(); + dispc_restore_context(); return 0;