drm/sun4i: frontend: Add support for tiled YUV input mode configuration

This introduces the data input mode definitions for the tiled YUV mode,
that are used in the input mode helper if tiling is requested.

The modifier is passed to the helper from the framebuffer to determine
if tiling is requested.

Only semiplanar and planar YUV formats are supported for tiling mode.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190118145133.21281-13-paul.kocialkowski@bootlin.com

diff --git a/drivers/gpu/drm/sun4i/sun4i_frontend.c b/drivers/gpu/drm/sun4i/sun4i_frontend.c
index 6219f5d0dc5343527f36a7f2027906366cc9290a..e950370792cefcbf1c3afd5207b44fa7830cce3f 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_frontend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_frontend.c
@@ -191,19 +191,23 @@ sun4i_frontend_drm_format_to_input_fmt(const struct drm_format_info *format,
 
 static int
 sun4i_frontend_drm_format_to_input_mode(const struct drm_format_info *format,
-                                       u32 *val)
+                                       uint64_t modifier, u32 *val)
 {
+       bool tiled = (modifier == DRM_FORMAT_MOD_ALLWINNER_TILED);
+
        switch (format->num_planes) {
        case 1:
                *val = SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PACKED;
                return 0;
 
        case 2:
-               *val = SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_SEMIPLANAR;
+               *val = tiled ? SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_MB32_SEMIPLANAR
+                            : SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_SEMIPLANAR;
                return 0;
 
        case 3:
-               *val = SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PLANAR;
+               *val = tiled ? SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_MB32_PLANAR
+                            : SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PLANAR;
                return 0;
 
        default:
@@ -325,6 +329,7 @@ int sun4i_frontend_update_formats(struct sun4i_frontend *frontend,
        struct drm_plane_state *state = plane->state;
        struct drm_framebuffer *fb = state->fb;
        const struct drm_format_info *format = fb->format;
+       uint64_t modifier = fb->modifier;
        u32 out_fmt_val;
        u32 in_fmt_val, in_mod_val, in_ps_val;
        unsigned int i;
@@ -337,7 +342,8 @@ int sun4i_frontend_update_formats(struct sun4i_frontend *frontend,
                return ret;
        }
 
-       ret = sun4i_frontend_drm_format_to_input_mode(format, &in_mod_val);
+       ret = sun4i_frontend_drm_format_to_input_mode(format, modifier,
+                                                     &in_mod_val);
        if (ret) {
                DRM_DEBUG_DRIVER("Invalid input mode\n");
                return ret;

diff --git a/drivers/gpu/drm/sun4i/sun4i_frontend.h b/drivers/gpu/drm/sun4i/sun4i_frontend.h
index c62735c2dc4bd87bbc34350ce588e44a77477f53..6c4d7797bb8a91a6fbbd1353e318157e8cdfc14e 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_frontend.h
+++ b/drivers/gpu/drm/sun4i/sun4i_frontend.h
@@ -33,6 +33,8 @@
 #define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PLANAR       (0 << 8)
 #define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PACKED       (1 << 8)
 #define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_SEMIPLANAR   (2 << 8)
+#define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_MB32_PLANAR  (4 << 8)
+#define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_MB32_SEMIPLANAR (6 << 8)
 #define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_YUV444       (0 << 4)
 #define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_YUV422       (1 << 4)
 #define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_YUV420       (2 << 4)