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

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / tilcdc / tilcdc_drv.c

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index d278093..ed68324 100644 (file)
--- 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;