5 files changed, 13 insertions, 54 deletions

diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index 1d053bbefc02..5ea0c82f9957 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -35,12 +35,6 @@
 
 #define MAX_CRTC        4
 
-struct imx_drm_device {
-        struct drm_device                       *drm;
-        unsigned int                            pipes;
-        struct drm_atomic_state                 *state;
-};
-
 #if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION)
 static int legacyfb_depth = 16;
 module_param(legacyfb_depth, int, 0444);
@@ -219,22 +213,12 @@ static int compare_of(struct device *dev, void *data)
 static int imx_drm_bind(struct device *dev)
 {
         struct drm_device *drm;
-        struct imx_drm_device *imxdrm;
         int ret;
 
         drm = drm_dev_alloc(&imx_drm_driver, dev);
         if (IS_ERR(drm))
                 return PTR_ERR(drm);
 
-        imxdrm = devm_kzalloc(dev, sizeof(*imxdrm), GFP_KERNEL);
-        if (!imxdrm) {
-                ret = -ENOMEM;
-                goto err_unref;
-        }
-
-        imxdrm->drm = drm;
-        drm->dev_private = imxdrm;
-
         /*
          * enable drm irq mode.
          * - with irq_enabled = true, we can use the vblank feature.
@@ -306,8 +290,7 @@ err_unbind:
         component_unbind_all(drm->dev, drm);
 err_kms:
         drm_mode_config_cleanup(drm);
-err_unref:
-        drm_dev_unref(drm);
+        drm_dev_put(drm);
 
         return ret;
 }
@@ -327,7 +310,7 @@ static void imx_drm_unbind(struct device *dev)
         component_unbind_all(drm->dev, drm);
         dev_set_drvdata(dev, NULL);
 
-        drm_dev_unref(drm);
+        drm_dev_put(drm);
 }
 
 static const struct component_master_ops imx_drm_ops = {
@@ -355,37 +338,15 @@ static int imx_drm_platform_remove(struct platform_device *pdev)
 static int imx_drm_suspend(struct device *dev)
 {
         struct drm_device *drm_dev = dev_get_drvdata(dev);
-        struct imx_drm_device *imxdrm;
-
-        /* The drm_dev is NULL before .load hook is called */
-        if (drm_dev == NULL)
-                return 0;
-
-        drm_kms_helper_poll_disable(drm_dev);
 
-        imxdrm = drm_dev->dev_private;
-        imxdrm->state = drm_atomic_helper_suspend(drm_dev);
-        if (IS_ERR(imxdrm->state)) {
-                drm_kms_helper_poll_enable(drm_dev);
-                return PTR_ERR(imxdrm->state);
-        }
-
-        return 0;
+        return drm_mode_config_helper_suspend(drm_dev);
 }
 
 static int imx_drm_resume(struct device *dev)
 {
         struct drm_device *drm_dev = dev_get_drvdata(dev);
-        struct imx_drm_device *imx_drm;
 
-        if (drm_dev == NULL)
-                return 0;
-
-        imx_drm = drm_dev->dev_private;
-        drm_atomic_helper_resume(drm_dev, imx_drm->state);
-        drm_kms_helper_poll_enable(drm_dev);
-
-        return 0;
+        return drm_mode_config_helper_resume(drm_dev);
 }
 #endif
 
diff --git a/drivers/gpu/drm/imx/imx-drm.h b/drivers/gpu/drm/imx/imx-drm.h
index 15c2bec47a04..ab9c6f706eb3 100644
--- a/drivers/gpu/drm/imx/imx-drm.h
+++ b/drivers/gpu/drm/imx/imx-drm.h
@@ -10,7 +10,6 @@ struct drm_display_mode;
 struct drm_encoder;
 struct drm_framebuffer;
 struct drm_plane;
-struct imx_drm_crtc;
 struct platform_device;
 
 struct imx_crtc_state {
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 7312beb6f1fc..3bd0f8a18e74 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -611,6 +611,9 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
                 return PTR_ERR(imx_ldb->regmap);
         }
 
+        /* disable LDB by resetting the control register to POR default */
+        regmap_write(imx_ldb->regmap, IOMUXC_GPR2, 0);
+
         imx_ldb->dev = dev;
 
         if (of_id)
@@ -651,14 +654,14 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
                 if (ret || i < 0 || i > 1)
                         return -EINVAL;
 
+                if (!of_device_is_available(child))
+                        continue;
+
                 if (dual && i > 0) {
                         dev_warn(dev, "dual-channel mode, ignoring second output\n");
                         continue;
                 }
 
-                if (!of_device_is_available(child))
-                        continue;
-
                 channel = &imx_ldb->channel[i];
                 channel->ldb = imx_ldb;
                 channel->chno = i;
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
index 21d002859ae0..7d4b710b837a 100644
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@ -35,7 +35,6 @@
 struct ipu_crtc {
         struct device           *dev;
         struct drm_crtc         base;
-        struct imx_drm_crtc     *imx_crtc;
 
         /* plane[0] is the full plane, plane[1] is the partial plane */
         struct ipu_plane        *plane[2];
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 203f247d4854..40605fdf0e33 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -281,16 +281,13 @@ static void ipu_plane_state_reset(struct drm_plane *plane)
                 ipu_state = to_ipu_plane_state(plane->state);
                 __drm_atomic_helper_plane_destroy_state(plane->state);
                 kfree(ipu_state);
+                plane->state = NULL;
         }
 
         ipu_state = kzalloc(sizeof(*ipu_state), GFP_KERNEL);
 
-        if (ipu_state) {
-                ipu_state->base.plane = plane;
-                ipu_state->base.rotation = DRM_MODE_ROTATE_0;
-        }
-
-        plane->state = &ipu_state->base;
+        if (ipu_state)
+                __drm_atomic_helper_plane_reset(plane, &ipu_state->base);
 }
 
 static struct drm_plane_state *