1 files changed, 23 insertions, 1 deletions

diff --git a/drivers/gpu/drm/sun4i/sun4i_framebuffer.c b/drivers/gpu/drm/sun4i/sun4i_framebuffer.c
index 38a36c0dfa2f..5f29850ef8ac 100644
--- a/drivers/gpu/drm/sun4i/sun4i_framebuffer.c
+++ b/drivers/gpu/drm/sun4i/sun4i_framebuffer.c
@@ -10,6 +10,7 @@
  * the License, or (at your option) any later version.
  */
 
+#include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_fb_cma_helper.h>
@@ -19,13 +20,33 @@
 #include "sun4i_drv.h"
 #include "sun4i_framebuffer.h"
 
+static int sun4i_de_atomic_check(struct drm_device *dev,
+                                 struct drm_atomic_state *state)
+{
+        int ret;
+
+        ret = drm_atomic_helper_check_modeset(dev, state);
+        if (ret)
+                return ret;
+
+        ret = drm_atomic_normalize_zpos(dev, state);
+        if (ret)
+                return ret;
+
+        return drm_atomic_helper_check_planes(dev, state);
+}
+
 static const struct drm_mode_config_funcs sun4i_de_mode_config_funcs = {
         .output_poll_changed    = drm_fb_helper_output_poll_changed,
-        .atomic_check           = drm_atomic_helper_check,
+        .atomic_check           = sun4i_de_atomic_check,
         .atomic_commit          = drm_atomic_helper_commit,
         .fb_create              = drm_gem_fb_create,
 };
 
+static struct drm_mode_config_helper_funcs sun4i_de_mode_config_helpers = {
+        .atomic_commit_tail     = drm_atomic_helper_commit_tail_rpm,
+};
+
 int sun4i_framebuffer_init(struct drm_device *drm)
 {
         drm_mode_config_reset(drm);
@@ -34,6 +55,7 @@ int sun4i_framebuffer_init(struct drm_device *drm)
         drm->mode_config.max_height = 8192;
 
         drm->mode_config.funcs = &sun4i_de_mode_config_funcs;
+        drm->mode_config.helper_private = &sun4i_de_mode_config_helpers;
 
         return drm_fb_cma_fbdev_init(drm, 32, 0);
 }