diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-11-21 09:01:40 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-01-13 05:19:52 -0500 |
commit | be07dcd7e239a854ae92041b3eb17863062e52e4 (patch) | |
tree | c66468b92e5d517d5866d07e39b65d0ed4d66051 /drivers/video | |
parent | f4f49c48b85babaf1a5d0082c30f11a8be3ce459 (diff) |
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')
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 2 |
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) | |||
3740 | 3740 | ||
3741 | static int dispc_runtime_resume(struct device *dev) | 3741 | static int dispc_runtime_resume(struct device *dev) |
3742 | { | 3742 | { |
3743 | _omap_dispc_initial_config(); | ||
3744 | |||
3743 | dispc_restore_context(); | 3745 | dispc_restore_context(); |
3744 | 3746 | ||
3745 | return 0; | 3747 | return 0; |