3 files changed, 8 insertions, 7 deletions

diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index 95e2181963d9..f5c621219113 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -115,7 +115,7 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
 {
         struct drm_device *dev = state->dev;
         struct drm_plane *plane;
-        struct drm_plane_state *old_plane_state;
+        struct drm_plane_state *old_plane_state, *new_plane_state;
         bool plane_disabling = false;
         int i;
 
@@ -127,15 +127,15 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
 
         drm_atomic_helper_commit_modeset_enables(dev, state);
 
-        for_each_plane_in_state(state, plane, old_plane_state, i) {
-                if (drm_atomic_plane_disabling(old_plane_state, plane->state))
+        for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
+                if (drm_atomic_plane_disabling(old_plane_state, new_plane_state))
                         plane_disabling = true;
         }
 
         if (plane_disabling) {
                 drm_atomic_helper_wait_for_vblanks(dev, state);
 
-                for_each_plane_in_state(state, plane, old_plane_state, i)
+                for_each_old_plane_in_state(state, plane, old_plane_state, i)
                         ipu_plane_disable_deferred(plane);
 
         }
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
index 5456c15d962c..53e0b24beda6 100644
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@ -50,7 +50,8 @@ static inline struct ipu_crtc *to_ipu_crtc(struct drm_crtc *crtc)
         return container_of(crtc, struct ipu_crtc, base);
 }
 
-static void ipu_crtc_enable(struct drm_crtc *crtc)
+static void ipu_crtc_atomic_enable(struct drm_crtc *crtc,
+                                   struct drm_crtc_state *old_state)
 {
         struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
         struct ipu_soc *ipu = dev_get_drvdata(ipu_crtc->dev->parent);
@@ -293,7 +294,7 @@ static const struct drm_crtc_helper_funcs ipu_helper_funcs = {
         .atomic_check = ipu_crtc_atomic_check,
         .atomic_begin = ipu_crtc_atomic_begin,
         .atomic_disable = ipu_crtc_atomic_disable,
-        .enable = ipu_crtc_enable,
+        .atomic_enable = ipu_crtc_atomic_enable,
 };
 
 static void ipu_put_resources(struct ipu_crtc *ipu_crtc)
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 49546222c6d3..ff53c8dec633 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -675,7 +675,7 @@ int ipu_planes_assign_pre(struct drm_device *dev,
         int available_pres = ipu_prg_max_active_channels();
         int i;
 
-        for_each_plane_in_state(state, plane, plane_state, i) {
+        for_each_new_plane_in_state(state, plane, plane_state, i) {
                 struct ipu_plane_state *ipu_state =
                                 to_ipu_plane_state(plane_state);
                 struct ipu_plane *ipu_plane = to_ipu_plane(plane);