8 files changed, 219 insertions, 45 deletions

diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
index bf49c55b0f2c..9e9255ee59cd 100644
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@ -48,8 +48,12 @@ static const u32 sunxi_rgb2yuv_coef[12] = {
 /*
  * These coefficients are taken from the A33 BSP from Allwinner.
  *
- * The formula is for each component, each coefficient being multiplied by
- * 1024 and each constant being multiplied by 16:
+ * The first three values of each row are coded as 13-bit signed fixed-point
+ * numbers, with 10 bits for the fractional part. The fourth value is a
+ * constant coded as a 14-bit signed fixed-point number with 4 bits for the
+ * fractional part.
+ *
+ * The values in table order give the following colorspace translation:
  * G = 1.164 * Y - 0.391 * U - 0.813 * V + 135
  * R = 1.164 * Y + 1.596 * V - 222
  * B = 1.164 * Y + 2.018 * U + 276
@@ -155,6 +159,36 @@ static int sun4i_backend_drm_format_to_layer(u32 format, u32 *mode)
         return 0;
 }
 
+static const uint32_t sun4i_backend_formats[] = {
+        DRM_FORMAT_ARGB1555,
+        DRM_FORMAT_ARGB4444,
+        DRM_FORMAT_ARGB8888,
+        DRM_FORMAT_BGRX8888,
+        DRM_FORMAT_RGB565,
+        DRM_FORMAT_RGB888,
+        DRM_FORMAT_RGBA4444,
+        DRM_FORMAT_RGBA5551,
+        DRM_FORMAT_UYVY,
+        DRM_FORMAT_VYUY,
+        DRM_FORMAT_XRGB8888,
+        DRM_FORMAT_YUYV,
+        DRM_FORMAT_YVYU,
+};
+
+bool sun4i_backend_format_is_supported(uint32_t fmt, uint64_t modifier)
+{
+        unsigned int i;
+
+        if (modifier != DRM_FORMAT_MOD_LINEAR)
+                return false;
+
+        for (i = 0; i < ARRAY_SIZE(sun4i_backend_formats); i++)
+                if (sun4i_backend_formats[i] == fmt)
+                        return true;
+
+        return false;
+}
+
 int sun4i_backend_update_layer_coord(struct sun4i_backend *backend,
                                      int layer, struct drm_plane *plane)
 {
@@ -395,6 +429,15 @@ int sun4i_backend_update_layer_zpos(struct sun4i_backend *backend, int layer,
         return 0;
 }
 
+void sun4i_backend_cleanup_layer(struct sun4i_backend *backend,
+                                 int layer)
+{
+        regmap_update_bits(backend->engine.regs,
+                           SUN4I_BACKEND_ATTCTL_REG0(layer),
+                           SUN4I_BACKEND_ATTCTL_REG0_LAY_VDOEN |
+                           SUN4I_BACKEND_ATTCTL_REG0_LAY_YUVEN, 0);
+}
+
 static bool sun4i_backend_plane_uses_scaler(struct drm_plane_state *state)
 {
         u16 src_h = state->src_h >> 16;
@@ -413,11 +456,50 @@ static bool sun4i_backend_plane_uses_frontend(struct drm_plane_state *state)
 {
         struct sun4i_layer *layer = plane_to_sun4i_layer(state->plane);
         struct sun4i_backend *backend = layer->backend;
+        uint32_t format = state->fb->format->format;
+        uint64_t modifier = state->fb->modifier;
 
         if (IS_ERR(backend->frontend))
                 return false;
 
-        return sun4i_backend_plane_uses_scaler(state);
+        if (!sun4i_frontend_format_is_supported(format, modifier))
+                return false;
+
+        if (!sun4i_backend_format_is_supported(format, modifier))
+                return true;
+
+        /*
+         * TODO: The backend alone allows 2x and 4x integer scaling, including
+         * support for an alpha component (which the frontend doesn't support).
+         * Use the backend directly instead of the frontend in this case, with
+         * another test to return false.
+         */
+
+        if (sun4i_backend_plane_uses_scaler(state))
+                return true;
+
+        /*
+         * Here the format is supported by both the frontend and the backend
+         * and no frontend scaling is required, so use the backend directly.
+         */
+        return false;
+}
+
+static bool sun4i_backend_plane_is_supported(struct drm_plane_state *state,
+                                             bool *uses_frontend)
+{
+        if (sun4i_backend_plane_uses_frontend(state)) {
+                *uses_frontend = true;
+                return true;
+        }
+
+        *uses_frontend = false;
+
+        /* Scaling is not supported without the frontend. */
+        if (sun4i_backend_plane_uses_scaler(state))
+                return false;
+
+        return true;
 }
 
 static void sun4i_backend_atomic_begin(struct sunxi_engine *engine,
@@ -460,14 +542,19 @@ static int sun4i_backend_atomic_check(struct sunxi_engine *engine,
                 struct drm_framebuffer *fb = plane_state->fb;
                 struct drm_format_name_buf format_name;
 
-                if (sun4i_backend_plane_uses_frontend(plane_state)) {
+                if (!sun4i_backend_plane_is_supported(plane_state,
+                                                      &layer_state->uses_frontend))
+                        return -EINVAL;
+
+                if (layer_state->uses_frontend) {
                         DRM_DEBUG_DRIVER("Using the frontend for plane %d\n",
                                          plane->index);
-
-                        layer_state->uses_frontend = true;
                         num_frontend_planes++;
                 } else {
-                        layer_state->uses_frontend = false;
+                        if (fb->format->is_yuv) {
+                                DRM_DEBUG_DRIVER("Plane FB format is YUV\n");
+                                num_yuv_planes++;
+                        }
                 }
 
                 DRM_DEBUG_DRIVER("Plane FB format is %s\n",
@@ -476,11 +563,6 @@ static int sun4i_backend_atomic_check(struct sunxi_engine *engine,
                 if (fb->format->has_alpha || (plane_state->alpha != DRM_BLEND_ALPHA_OPAQUE))
                         num_alpha_planes++;
 
-                if (fb->format->is_yuv) {
-                        DRM_DEBUG_DRIVER("Plane FB format is YUV\n");
-                        num_yuv_planes++;
-                }
-
                 DRM_DEBUG_DRIVER("Plane zpos is %d\n",
                                  plane_state->normalized_zpos);
 
diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.h b/drivers/gpu/drm/sun4i/sun4i_backend.h
index e3d4c6035eb2..01f66463271b 100644
--- a/drivers/gpu/drm/sun4i/sun4i_backend.h
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.h
@@ -198,6 +198,7 @@ engine_to_sun4i_backend(struct sunxi_engine *engine)
 
 void sun4i_backend_layer_enable(struct sun4i_backend *backend,
                                 int layer, bool enable);
+bool sun4i_backend_format_is_supported(uint32_t fmt, uint64_t modifier);
 int sun4i_backend_update_layer_coord(struct sun4i_backend *backend,
                                      int layer, struct drm_plane *plane);
 int sun4i_backend_update_layer_formats(struct sun4i_backend *backend,
@@ -208,5 +209,7 @@ int sun4i_backend_update_layer_frontend(struct sun4i_backend *backend,
                                         int layer, uint32_t in_fmt);
 int sun4i_backend_update_layer_zpos(struct sun4i_backend *backend,
                                     int layer, struct drm_plane *plane);
+void sun4i_backend_cleanup_layer(struct sun4i_backend *backend,
+                                 int layer);
 
 #endif /* _SUN4I_BACKEND_H_ */
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index ef773d36baf0..ccdeae6299eb 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -28,6 +28,16 @@
 #include "sun4i_tcon.h"
 #include "sun8i_tcon_top.h"
 
+static int drm_sun4i_gem_dumb_create(struct drm_file *file_priv,
+                                     struct drm_device *drm,
+                                     struct drm_mode_create_dumb *args)
+{
+        /* The hardware only allows even pitches for YUV buffers. */
+        args->pitch = ALIGN(DIV_ROUND_UP(args->width * args->bpp, 8), 2);
+
+        return drm_gem_cma_dumb_create_internal(file_priv, drm, args);
+}
+
 DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops);
 
 static struct drm_driver sun4i_drv_driver = {
@@ -42,7 +52,7 @@ static struct drm_driver sun4i_drv_driver = {
         .minor                  = 0,
 
         /* GEM Operations */
-        .dumb_create            = drm_gem_cma_dumb_create,
+        .dumb_create            = drm_sun4i_gem_dumb_create,
         .gem_free_object_unlocked = drm_gem_cma_free_object,
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
 
diff --git a/drivers/gpu/drm/sun4i/sun4i_frontend.c b/drivers/gpu/drm/sun4i/sun4i_frontend.c
index ddf6cfa6dd23..1a7ebc45747e 100644
--- a/drivers/gpu/drm/sun4i/sun4i_frontend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_frontend.c
@@ -107,8 +107,34 @@ EXPORT_SYMBOL(sun4i_frontend_update_buffer);
 static int sun4i_frontend_drm_format_to_input_fmt(uint32_t fmt, u32 *val)
 {
         switch (fmt) {
-        case DRM_FORMAT_ARGB8888:
-                *val = 5;
+        case DRM_FORMAT_XRGB8888:
+                *val = SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_RGB;
+                return 0;
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static int sun4i_frontend_drm_format_to_input_mode(uint32_t fmt, u32 *val)
+{
+        if (drm_format_num_planes(fmt) == 1)
+                *val = SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PACKED;
+        else
+                return -EINVAL;
+
+        return 0;
+}
+
+static int sun4i_frontend_drm_format_to_input_sequence(uint32_t fmt, u32 *val)
+{
+        switch (fmt) {
+        case DRM_FORMAT_BGRX8888:
+                *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_BGRX;
+                return 0;
+
+        case DRM_FORMAT_XRGB8888:
+                *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_XRGB;
                 return 0;
 
         default:
@@ -119,9 +145,12 @@ static int sun4i_frontend_drm_format_to_input_fmt(uint32_t fmt, u32 *val)
 static int sun4i_frontend_drm_format_to_output_fmt(uint32_t fmt, u32 *val)
 {
         switch (fmt) {
+        case DRM_FORMAT_BGRX8888:
+                *val = SUN4I_FRONTEND_OUTPUT_FMT_DATA_FMT_BGRX8888;
+                return 0;
+
         case DRM_FORMAT_XRGB8888:
-        case DRM_FORMAT_ARGB8888:
-                *val = 2;
+                *val = SUN4I_FRONTEND_OUTPUT_FMT_DATA_FMT_XRGB8888;
                 return 0;
 
         default:
@@ -129,22 +158,54 @@ static int sun4i_frontend_drm_format_to_output_fmt(uint32_t fmt, u32 *val)
         }
 }
 
+static const uint32_t sun4i_frontend_formats[] = {
+        DRM_FORMAT_BGRX8888,
+        DRM_FORMAT_XRGB8888,
+};
+
+bool sun4i_frontend_format_is_supported(uint32_t fmt, uint64_t modifier)
+{
+        unsigned int i;
+
+        if (modifier != DRM_FORMAT_MOD_LINEAR)
+                return false;
+
+        for (i = 0; i < ARRAY_SIZE(sun4i_frontend_formats); i++)
+                if (sun4i_frontend_formats[i] == fmt)
+                        return true;
+
+        return false;
+}
+EXPORT_SYMBOL(sun4i_frontend_format_is_supported);
+
 int sun4i_frontend_update_formats(struct sun4i_frontend *frontend,
                                   struct drm_plane *plane, uint32_t out_fmt)
 {
         struct drm_plane_state *state = plane->state;
         struct drm_framebuffer *fb = state->fb;
+        uint32_t format = fb->format->format;
         u32 out_fmt_val;
-        u32 in_fmt_val;
+        u32 in_fmt_val, in_mod_val, in_ps_val;
         int ret;
 
-        ret = sun4i_frontend_drm_format_to_input_fmt(fb->format->format,
-                                                     &in_fmt_val);
+        ret = sun4i_frontend_drm_format_to_input_fmt(format, &in_fmt_val);
         if (ret) {
                 DRM_DEBUG_DRIVER("Invalid input format\n");
                 return ret;
         }
 
+        ret = sun4i_frontend_drm_format_to_input_mode(format, &in_mod_val);
+        if (ret) {
+                DRM_DEBUG_DRIVER("Invalid input mode\n");
+                return ret;
+        }
+
+        ret = sun4i_frontend_drm_format_to_input_sequence(format, &in_ps_val);
+        if (ret) {
+                DRM_DEBUG_DRIVER("Invalid pixel sequence\n");
+                return ret;
+        }
+
         ret = sun4i_frontend_drm_format_to_output_fmt(out_fmt, &out_fmt_val);
         if (ret) {
                 DRM_DEBUG_DRIVER("Invalid output format\n");
@@ -162,10 +223,12 @@ int sun4i_frontend_update_formats(struct sun4i_frontend *frontend,
         regmap_write(frontend->regs, SUN4I_FRONTEND_CH0_VERTPHASE1_REG, 0x400);
         regmap_write(frontend->regs, SUN4I_FRONTEND_CH1_VERTPHASE1_REG, 0x400);
 
+        regmap_update_bits(frontend->regs, SUN4I_FRONTEND_BYPASS_REG,
+                           SUN4I_FRONTEND_BYPASS_CSC_EN,
+                           SUN4I_FRONTEND_BYPASS_CSC_EN);
+
         regmap_write(frontend->regs, SUN4I_FRONTEND_INPUT_FMT_REG,
-                     SUN4I_FRONTEND_INPUT_FMT_DATA_MOD(1) |
-                     SUN4I_FRONTEND_INPUT_FMT_DATA_FMT(in_fmt_val) |
-                     SUN4I_FRONTEND_INPUT_FMT_PS(1));
+                     in_mod_val | in_fmt_val | in_ps_val);
 
         /*
          * TODO: It look like the A31 and A80 at least will need the
@@ -173,7 +236,7 @@ int sun4i_frontend_update_formats(struct sun4i_frontend *frontend,
          * ARGB8888).
          */
         regmap_write(frontend->regs, SUN4I_FRONTEND_OUTPUT_FMT_REG,
-                     SUN4I_FRONTEND_OUTPUT_FMT_DATA_FMT(out_fmt_val));
+                     out_fmt_val);
 
         return 0;
 }
@@ -183,16 +246,24 @@ void sun4i_frontend_update_coord(struct sun4i_frontend *frontend,
                                  struct drm_plane *plane)
 {
         struct drm_plane_state *state = plane->state;
+        struct drm_framebuffer *fb = state->fb;
+        uint32_t luma_width, luma_height;
+        uint32_t chroma_width, chroma_height;
 
         /* Set height and width */
         DRM_DEBUG_DRIVER("Frontend size W: %u H: %u\n",
                          state->crtc_w, state->crtc_h);
+
+        luma_width = state->src_w >> 16;
+        luma_height = state->src_h >> 16;
+
+        chroma_width = DIV_ROUND_UP(luma_width, fb->format->hsub);
+        chroma_height = DIV_ROUND_UP(luma_height, fb->format->vsub);
+
         regmap_write(frontend->regs, SUN4I_FRONTEND_CH0_INSIZE_REG,
-                     SUN4I_FRONTEND_INSIZE(state->src_h >> 16,
-                                           state->src_w >> 16));
+                     SUN4I_FRONTEND_INSIZE(luma_height, luma_width));
         regmap_write(frontend->regs, SUN4I_FRONTEND_CH1_INSIZE_REG,
-                     SUN4I_FRONTEND_INSIZE(state->src_h >> 16,
-                                           state->src_w >> 16));
+                     SUN4I_FRONTEND_INSIZE(chroma_height, chroma_width));
 
         regmap_write(frontend->regs, SUN4I_FRONTEND_CH0_OUTSIZE_REG,
                      SUN4I_FRONTEND_OUTSIZE(state->crtc_h, state->crtc_w));
@@ -200,14 +271,14 @@ void sun4i_frontend_update_coord(struct sun4i_frontend *frontend,
                      SUN4I_FRONTEND_OUTSIZE(state->crtc_h, state->crtc_w));
 
         regmap_write(frontend->regs, SUN4I_FRONTEND_CH0_HORZFACT_REG,
-                     state->src_w / state->crtc_w);
+                     (luma_width << 16) / state->crtc_w);
         regmap_write(frontend->regs, SUN4I_FRONTEND_CH1_HORZFACT_REG,
-                     state->src_w / state->crtc_w);
+                     (chroma_width << 16) / state->crtc_w);
 
         regmap_write(frontend->regs, SUN4I_FRONTEND_CH0_VERTFACT_REG,
-                     state->src_h / state->crtc_h);
+                     (luma_height << 16) / state->crtc_h);
         regmap_write(frontend->regs, SUN4I_FRONTEND_CH1_VERTFACT_REG,
-                     state->src_h / state->crtc_h);
+                     (chroma_height << 16) / state->crtc_h);
 
         regmap_write_bits(frontend->regs, SUN4I_FRONTEND_FRM_CTRL_REG,
                           SUN4I_FRONTEND_FRM_CTRL_REG_RDY,
@@ -339,10 +410,6 @@ static int sun4i_frontend_runtime_resume(struct device *dev)
                            SUN4I_FRONTEND_EN_EN,
                            SUN4I_FRONTEND_EN_EN);
 
-        regmap_update_bits(frontend->regs, SUN4I_FRONTEND_BYPASS_REG,
-                           SUN4I_FRONTEND_BYPASS_CSC_EN,
-                           SUN4I_FRONTEND_BYPASS_CSC_EN);
-
         sun4i_frontend_scaler_init(frontend);
 
         return 0;
diff --git a/drivers/gpu/drm/sun4i/sun4i_frontend.h b/drivers/gpu/drm/sun4i/sun4i_frontend.h
index 02661ce81f3e..ad146e8d8d70 100644
--- a/drivers/gpu/drm/sun4i/sun4i_frontend.h
+++ b/drivers/gpu/drm/sun4i/sun4i_frontend.h
@@ -26,12 +26,14 @@
 #define SUN4I_FRONTEND_LINESTRD0_REG            0x040
 
 #define SUN4I_FRONTEND_INPUT_FMT_REG            0x04c
-#define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD(mod)          ((mod) << 8)
-#define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT(fmt)          ((fmt) << 4)
-#define SUN4I_FRONTEND_INPUT_FMT_PS(ps)                 (ps)
+#define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PACKED        (1 << 8)
+#define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_RGB           (5 << 4)
+#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_BGRX           0
+#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_XRGB           1
 
 #define SUN4I_FRONTEND_OUTPUT_FMT_REG           0x05c
-#define SUN4I_FRONTEND_OUTPUT_FMT_DATA_FMT(fmt)         (fmt)
+#define SUN4I_FRONTEND_OUTPUT_FMT_DATA_FMT_BGRX8888     1
+#define SUN4I_FRONTEND_OUTPUT_FMT_DATA_FMT_XRGB8888     2
 
 #define SUN4I_FRONTEND_CH0_INSIZE_REG           0x100
 #define SUN4I_FRONTEND_INSIZE(h, w)                     ((((h) - 1) << 16) | (((w) - 1)))
@@ -95,5 +97,6 @@ void sun4i_frontend_update_coord(struct sun4i_frontend *frontend,
                                  struct drm_plane *plane);
 int sun4i_frontend_update_formats(struct sun4i_frontend *frontend,
                                   struct drm_plane *plane, uint32_t out_fmt);
+bool sun4i_frontend_format_is_supported(uint32_t fmt, uint64_t modifier);
 
 #endif /* _SUN4I_FRONTEND_H_ */
diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/sun4i_layer.c
index 78f77af8805a..29631e0efde3 100644
--- a/drivers/gpu/drm/sun4i/sun4i_layer.c
+++ b/drivers/gpu/drm/sun4i/sun4i_layer.c
@@ -12,6 +12,7 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_plane_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drmP.h>
 
 #include "sun4i_backend.h"
@@ -92,14 +93,16 @@ static void sun4i_backend_layer_atomic_update(struct drm_plane *plane,
         struct sun4i_backend *backend = layer->backend;
         struct sun4i_frontend *frontend = backend->frontend;
 
+        sun4i_backend_cleanup_layer(backend, layer->id);
+
         if (layer_state->uses_frontend) {
                 sun4i_frontend_init(frontend);
                 sun4i_frontend_update_coord(frontend, plane);
                 sun4i_frontend_update_buffer(frontend, plane);
                 sun4i_frontend_update_formats(frontend, plane,
-                                              DRM_FORMAT_ARGB8888);
+                                              DRM_FORMAT_XRGB8888);
                 sun4i_backend_update_layer_frontend(backend, layer->id,
-                                                    DRM_FORMAT_ARGB8888);
+                                                    DRM_FORMAT_XRGB8888);
                 sun4i_frontend_enable(frontend);
         } else {
                 sun4i_backend_update_layer_formats(backend, layer->id, plane);
@@ -112,6 +115,7 @@ static void sun4i_backend_layer_atomic_update(struct drm_plane *plane,
 }
 
 static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = {
+        .prepare_fb     = drm_gem_fb_prepare_fb,
         .atomic_disable = sun4i_backend_layer_atomic_disable,
         .atomic_update  = sun4i_backend_layer_atomic_update,
 };
@@ -125,10 +129,11 @@ static const struct drm_plane_funcs sun4i_backend_layer_funcs = {
         .update_plane           = drm_atomic_helper_update_plane,
 };
 
-static const uint32_t sun4i_backend_layer_formats[] = {
+static const uint32_t sun4i_layer_formats[] = {
         DRM_FORMAT_ARGB8888,
         DRM_FORMAT_ARGB4444,
         DRM_FORMAT_ARGB1555,
+        DRM_FORMAT_BGRX8888,
         DRM_FORMAT_RGBA5551,
         DRM_FORMAT_RGBA4444,
         DRM_FORMAT_RGB888,
@@ -154,8 +159,8 @@ static struct sun4i_layer *sun4i_layer_init_one(struct drm_device *drm,
         /* possible crtcs are set later */
         ret = drm_universal_plane_init(drm, &layer->plane, 0,
                                        &sun4i_backend_layer_funcs,
-                                       sun4i_backend_layer_formats,
-                                       ARRAY_SIZE(sun4i_backend_layer_formats),
+                                       sun4i_layer_formats,
+                                       ARRAY_SIZE(sun4i_layer_formats),
                                        NULL, type, NULL);
         if (ret) {
                 dev_err(drm->dev, "Couldn't initialize layer\n");
diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
index e3fc8fa920fb..18534263a05d 100644
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
@@ -19,6 +19,7 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drmP.h>
 
@@ -300,6 +301,7 @@ static void sun8i_ui_layer_atomic_update(struct drm_plane *plane,
 }
 
 static struct drm_plane_helper_funcs sun8i_ui_layer_helper_funcs = {
+        .prepare_fb     = drm_gem_fb_prepare_fb,
         .atomic_check   = sun8i_ui_layer_atomic_check,
         .atomic_disable = sun8i_ui_layer_atomic_disable,
         .atomic_update  = sun8i_ui_layer_atomic_update,
diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index 4249edfb47ed..87be898f9b7a 100644
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -13,6 +13,7 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drmP.h>
 
@@ -336,6 +337,7 @@ static void sun8i_vi_layer_atomic_update(struct drm_plane *plane,
 }
 
 static struct drm_plane_helper_funcs sun8i_vi_layer_helper_funcs = {
+        .prepare_fb     = drm_gem_fb_prepare_fb,
         .atomic_check   = sun8i_vi_layer_atomic_check,
         .atomic_disable = sun8i_vi_layer_atomic_disable,
         .atomic_update  = sun8i_vi_layer_atomic_update,