Merge tag 'drm-fsl-dcu-fixes-for-v4.15' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next

Some cleanup/fixes, some noticed during testing of Noralf Trønnes
rework of the suspend/resume helper. He will rebase the patchset
ontop of this.

* tag 'drm-fsl-dcu-fixes-for-v4.15' of http://git.agner.ch/git/linux-drm-fsl-dcu:
  drm/fsl-dcu: enable IRQ before drm_atomic_helper_resume()
  drm/fsl-dcu: avoid disabling pixel clock twice on suspend
  drm/fsl-dcu: Don't set connector DPMS property

2 files changed, 1 insertions, 7 deletions

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index 58e9e0601a61..faf17b83b910 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -210,7 +210,6 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
                 return PTR_ERR(fsl_dev->state);
         }
 
-        clk_disable_unprepare(fsl_dev->pix_clk);
         clk_disable_unprepare(fsl_dev->clk);
 
         return 0;
@@ -233,6 +232,7 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
         if (fsl_dev->tcon)
                 fsl_tcon_bypass_enable(fsl_dev->tcon);
         fsl_dcu_drm_init_planes(fsl_dev->drm);
+        enable_irq(fsl_dev->irq);
         drm_atomic_helper_resume(fsl_dev->drm, fsl_dev->state);
 
         console_lock();
@@ -240,7 +240,6 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
         console_unlock();
 
         drm_kms_helper_poll_enable(fsl_dev->drm);
-        enable_irq(fsl_dev->irq);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
index edd7d8127d19..c54806d08dd7 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
@@ -102,7 +102,6 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,
 {
         struct drm_encoder *encoder = &fsl_dev->encoder;
         struct drm_connector *connector = &fsl_dev->connector.base;
-        struct drm_mode_config *mode_config = &fsl_dev->drm->mode_config;
         int ret;
 
         fsl_dev->connector.encoder = encoder;
@@ -122,10 +121,6 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,
         if (ret < 0)
                 goto err_sysfs;
 
-        drm_object_property_set_value(&connector->base,
-                                      mode_config->dpms_property,
-                                      DRM_MODE_DPMS_OFF);
-
         ret = drm_panel_attach(panel, connector);
         if (ret) {
                 dev_err(fsl_dev->dev, "failed to attach panel\n");