1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 58725d34d411..01a21dd835b5 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -31,7 +31,7 @@
  * struct mtk_drm_crtc - MediaTek specific crtc structure.
  * @base: crtc object.
  * @enabled: records whether crtc_enable succeeded
- * @planes: array of 4 mtk_drm_plane structures, one for each overlay plane
+ * @planes: array of 4 drm_plane structures, one for each overlay plane
  * @pending_planes: whether any plane has pending changes to be applied
  * @config_regs: memory mapped mmsys configuration register space
  * @mutex: handle to one of the ten disp_mutex streams
@@ -45,7 +45,7 @@ struct mtk_drm_crtc {
         bool                            pending_needs_vblank;
         struct drm_pending_vblank_event *event;
 
-        struct mtk_drm_plane            planes[OVL_LAYER_NR];
+        struct drm_plane                planes[OVL_LAYER_NR];
         bool                            pending_planes;
 
         void __iomem                    *config_regs;
@@ -112,8 +112,7 @@ static void mtk_drm_crtc_reset(struct drm_crtc *crtc)
         struct mtk_crtc_state *state;
 
         if (crtc->state) {
-                if (crtc->state->mode_blob)
-                        drm_property_unreference_blob(crtc->state->mode_blob);
+                __drm_atomic_helper_crtc_destroy_state(crtc->state);
 
                 state = to_mtk_crtc_state(crtc->state);
                 memset(state, 0, sizeof(*state));
@@ -287,7 +286,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
 
         /* Initially configure all planes */
         for (i = 0; i < OVL_LAYER_NR; i++) {
-                struct drm_plane *plane = &mtk_crtc->planes[i].base;
+                struct drm_plane *plane = &mtk_crtc->planes[i];
                 struct mtk_plane_state *plane_state;
 
                 plane_state = to_mtk_plane_state(plane->state);
@@ -366,7 +365,7 @@ static void mtk_drm_crtc_disable(struct drm_crtc *crtc)
 
         /* Set all pending plane state to disabled */
         for (i = 0; i < OVL_LAYER_NR; i++) {
-                struct drm_plane *plane = &mtk_crtc->planes[i].base;
+                struct drm_plane *plane = &mtk_crtc->planes[i];
                 struct mtk_plane_state *plane_state;
 
                 plane_state = to_mtk_plane_state(plane->state);
@@ -412,7 +411,7 @@ static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc,
         if (mtk_crtc->event)
                 mtk_crtc->pending_needs_vblank = true;
         for (i = 0; i < OVL_LAYER_NR; i++) {
-                struct drm_plane *plane = &mtk_crtc->planes[i].base;
+                struct drm_plane *plane = &mtk_crtc->planes[i];
                 struct mtk_plane_state *plane_state;
 
                 plane_state = to_mtk_plane_state(plane->state);
@@ -490,7 +489,7 @@ void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *ovl)
 
         if (mtk_crtc->pending_planes) {
                 for (i = 0; i < OVL_LAYER_NR; i++) {
-                        struct drm_plane *plane = &mtk_crtc->planes[i].base;
+                        struct drm_plane *plane = &mtk_crtc->planes[i];
                         struct mtk_plane_state *plane_state;
 
                         plane_state = to_mtk_plane_state(plane->state);
@@ -578,13 +577,13 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                                 (zpos == 1) ? DRM_PLANE_TYPE_CURSOR :
                                                 DRM_PLANE_TYPE_OVERLAY;
                 ret = mtk_plane_init(drm_dev, &mtk_crtc->planes[zpos],
-                                     BIT(pipe), type, zpos);
+                                     BIT(pipe), type);
                 if (ret)
                         goto unprepare;
         }
 
-        ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0].base,
-                                &mtk_crtc->planes[1].base, pipe);
+        ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
+                                &mtk_crtc->planes[1], pipe);
         if (ret < 0)
                 goto unprepare;
         drm_mode_crtc_set_gamma_size(&mtk_crtc->base, MTK_LUT_SIZE);