summaryrefslogtreecommitdiff
path: root/drivers/video/omap2/dss/dispc.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-11-21 18:01:40 +0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-01-13 14:19:52 +0400
commitbe07dcd7e239a854ae92041b3eb17863062e52e4 (patch)
treec66468b92e5d517d5866d07e39b65d0ed4d66051 /drivers/video/omap2/dss/dispc.c
parentf4f49c48b85babaf1a5d0082c30f11a8be3ce459 (diff)
downloadlinux-be07dcd7e239a854ae92041b3eb17863062e52e4.tar.xz
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 <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dispc.c')
-rw-r--r--drivers/video/omap2/dss/dispc.c2
1 files changed, 2 insertions, 0 deletions
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;