drm/atmel-hlcdc: Fix suspend/resume implementation

The current suspend resume implementation is assuming register values are
kept when entering suspend, which is no longer the case with the
suspend-to-RAM on the sama5d2.

While at it, switch to the generic infrastructure to enter suspend mode
(drm_atomic_helper_suspend/resume()).

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1488371461-22243-1-git-send-email-boris.brezillon@free-electrons.com

1 files changed, 16 insertions, 15 deletions

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index 178acbf5f6c5..f4a3065f7f51 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
@@ -800,31 +800,32 @@ static int atmel_hlcdc_dc_drm_remove(struct platform_device *pdev)
 static int atmel_hlcdc_dc_drm_suspend(struct device *dev)
 {
         struct drm_device *drm_dev = dev_get_drvdata(dev);
-        struct drm_crtc *crtc;
+        struct atmel_hlcdc_dc *dc = drm_dev->dev_private;
+        struct regmap *regmap = dc->hlcdc->regmap;
+        struct drm_atomic_state *state;
+
+        state = drm_atomic_helper_suspend(drm_dev);
+        if (IS_ERR(state))
+                return PTR_ERR(state);
 
-        if (pm_runtime_suspended(dev))
-                return 0;
+        dc->suspend.state = state;
+
+        regmap_read(regmap, ATMEL_HLCDC_IMR, &dc->suspend.imr);
+        regmap_write(regmap, ATMEL_HLCDC_IDR, dc->suspend.imr);
+        clk_disable_unprepare(dc->hlcdc->periph_clk);
 
-        drm_modeset_lock_all(drm_dev);
-        list_for_each_entry(crtc, &drm_dev->mode_config.crtc_list, head)
-                atmel_hlcdc_crtc_suspend(crtc);
-        drm_modeset_unlock_all(drm_dev);
         return 0;
 }
 
 static int atmel_hlcdc_dc_drm_resume(struct device *dev)
 {
         struct drm_device *drm_dev = dev_get_drvdata(dev);
-        struct drm_crtc *crtc;
+        struct atmel_hlcdc_dc *dc = drm_dev->dev_private;
 
-        if (pm_runtime_suspended(dev))
-                return 0;
+        clk_prepare_enable(dc->hlcdc->periph_clk);
+        regmap_write(dc->hlcdc->regmap, ATMEL_HLCDC_IER, dc->suspend.imr);
 
-        drm_modeset_lock_all(drm_dev);
-        list_for_each_entry(crtc, &drm_dev->mode_config.crtc_list, head)
-                atmel_hlcdc_crtc_resume(crtc);
-        drm_modeset_unlock_all(drm_dev);
-        return 0;
+        return drm_atomic_helper_resume(drm_dev, dc->suspend.state);
 }
 #endif