drm/tilcdc: Restore old dpms state in pm_resume()

Restore old dpms state in pm_resume(). The dpms is turned off in
pm_suspend() and it should be restored to its original state in
pm_resume(). Without this patch the display is left blanked after a
suspend/resume cycle.

Fixes commit 614b3cfeb8d2 ("drm/tilcdc: disable the lcd controller/dma
engine when suspend invoked")

Signed-off-by: Jyri Sarha <jsarha@ti.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index d27809372d54..ed68324504f6 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -597,6 +597,7 @@ static int tilcdc_pm_suspend(struct device *dev)
         }
 
         /* Disable the LCDC controller, to avoid locking up the PRCM */
+        priv->saved_dpms_state = tilcdc_crtc_current_dpms_state(priv->crtc);
         tilcdc_crtc_dpms(priv->crtc, DRM_MODE_DPMS_OFF);
 
         /* Save register state: */
@@ -627,6 +628,8 @@ static int tilcdc_pm_resume(struct device *dev)
                                              priv->saved_register[n++]);
         }
 
+        tilcdc_crtc_dpms(priv->crtc, priv->saved_dpms_state);
+
         drm_kms_helper_poll_enable(ddev);
 
         return 0;