Merge tag 'tilcdc-4.20' of https://github.com/jsarha/linux into drm-next

drm/tilcdc changes for Linux v4.20

suspend/resume update.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Jyri Sarha <jsarha@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/bd8d6b40-d3d6-8e24-9d48-6201b860aceb@ti.com

2 files changed, 4 insertions, 13 deletions

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index 0fb300d41a09..33e533268488 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -554,29 +554,23 @@ static struct drm_driver tilcdc_driver = {
 static int tilcdc_pm_suspend(struct device *dev)
 {
         struct drm_device *ddev = dev_get_drvdata(dev);
-        struct tilcdc_drm_private *priv = ddev->dev_private;
+        int ret = 0;
 
-        priv->saved_state = drm_atomic_helper_suspend(ddev);
+        ret = drm_mode_config_helper_suspend(ddev);
 
         /* Select sleep pin state */
         pinctrl_pm_select_sleep_state(dev);
 
-        return 0;
+        return ret;
 }
 
 static int tilcdc_pm_resume(struct device *dev)
 {
         struct drm_device *ddev = dev_get_drvdata(dev);
-        struct tilcdc_drm_private *priv = ddev->dev_private;
-        int ret = 0;
 
         /* Select default pin state */
         pinctrl_pm_select_default_state(dev);
-
-        if (priv->saved_state)
-                ret = drm_atomic_helper_resume(ddev, priv->saved_state);
-
-        return ret;
+        return  drm_mode_config_helper_resume(ddev);
 }
 #endif
 
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.h b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
index ead512216669..62cea5ff5558 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.h
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
@@ -70,9 +70,6 @@ struct tilcdc_drm_private {
         const uint32_t *pixelformats;
         uint32_t num_pixelformats;
 
-        /* The context for pm susped/resume cycle is stored here */
-        struct drm_atomic_state *saved_state;
-
 #ifdef CONFIG_CPU_FREQ
         struct notifier_block freq_transition;
 #endif