YUV formats need scaler support due to chroma upscaling, but that's not
yet supported in the driver. Remove them from supported list until
DE33 scaler is properly supported.

Reviewed-by: Chen-Yu Tsai <[email protected]>
Signed-off-by: Jernej Skrabec <[email protected]>
---
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 72 ++++++++++++++++++++------
 1 file changed, 56 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c 
b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index 6b19fafd50ad..09d94f7f9977 100644
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -380,6 +380,33 @@ static const u32 sun8i_vi_layer_de3_formats[] = {
        DRM_FORMAT_YVU422,
 };
 
+static const u32 sun8i_vi_layer_de3_no_yuv_formats[] = {
+       DRM_FORMAT_ABGR1555,
+       DRM_FORMAT_ABGR2101010,
+       DRM_FORMAT_ABGR4444,
+       DRM_FORMAT_ABGR8888,
+       DRM_FORMAT_ARGB1555,
+       DRM_FORMAT_ARGB2101010,
+       DRM_FORMAT_ARGB4444,
+       DRM_FORMAT_ARGB8888,
+       DRM_FORMAT_BGR565,
+       DRM_FORMAT_BGR888,
+       DRM_FORMAT_BGRA1010102,
+       DRM_FORMAT_BGRA5551,
+       DRM_FORMAT_BGRA4444,
+       DRM_FORMAT_BGRA8888,
+       DRM_FORMAT_BGRX8888,
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_RGB888,
+       DRM_FORMAT_RGBA1010102,
+       DRM_FORMAT_RGBA4444,
+       DRM_FORMAT_RGBA5551,
+       DRM_FORMAT_RGBA8888,
+       DRM_FORMAT_RGBX8888,
+       DRM_FORMAT_XBGR8888,
+       DRM_FORMAT_XRGB8888,
+};
+
 static const uint64_t sun8i_layer_modifiers[] = {
        DRM_FORMAT_MOD_LINEAR,
        DRM_FORMAT_MOD_INVALID
@@ -395,6 +422,7 @@ struct sun8i_layer *sun8i_vi_layer_init_one(struct 
drm_device *drm,
        u32 supported_encodings, supported_ranges;
        unsigned int format_count;
        struct sun8i_layer *layer;
+       bool yuv_support = true;
        const u32 *formats;
        int ret;
 
@@ -410,8 +438,18 @@ struct sun8i_layer *sun8i_vi_layer_init_one(struct 
drm_device *drm,
        layer->cfg = cfg;
 
        if (layer->cfg->de_type >= SUN8I_MIXER_DE3) {
-               formats = sun8i_vi_layer_de3_formats;
-               format_count = ARRAY_SIZE(sun8i_vi_layer_de3_formats);
+               /*
+                * TODO: DE33 drivers doesn't support scaling yet, which is a
+                * requirement for YUV support.
+                */
+               yuv_support = layer->cfg->scaler_mask & BIT(phy_index);
+               if (yuv_support) {
+                       formats = sun8i_vi_layer_de3_formats;
+                       format_count = ARRAY_SIZE(sun8i_vi_layer_de3_formats);
+               } else {
+                       formats = sun8i_vi_layer_de3_no_yuv_formats;
+                       format_count = 
ARRAY_SIZE(sun8i_vi_layer_de3_no_yuv_formats);
+               }
        } else {
                formats = sun8i_vi_layer_formats;
                format_count = ARRAY_SIZE(sun8i_vi_layer_formats);
@@ -443,22 +481,24 @@ struct sun8i_layer *sun8i_vi_layer_init_one(struct 
drm_device *drm,
                return ERR_PTR(ret);
        }
 
-       supported_encodings = BIT(DRM_COLOR_YCBCR_BT601) |
-                             BIT(DRM_COLOR_YCBCR_BT709);
-       if (layer->cfg->de_type >= SUN8I_MIXER_DE3)
-               supported_encodings |= BIT(DRM_COLOR_YCBCR_BT2020);
+       if (yuv_support) {
+               supported_encodings = BIT(DRM_COLOR_YCBCR_BT601) |
+                                     BIT(DRM_COLOR_YCBCR_BT709);
+               if (layer->cfg->de_type >= SUN8I_MIXER_DE3)
+                       supported_encodings |= BIT(DRM_COLOR_YCBCR_BT2020);
 
-       supported_ranges = BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
-                          BIT(DRM_COLOR_YCBCR_FULL_RANGE);
+               supported_ranges = BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
+                                  BIT(DRM_COLOR_YCBCR_FULL_RANGE);
 
-       ret = drm_plane_create_color_properties(&layer->plane,
-                                               supported_encodings,
-                                               supported_ranges,
-                                               DRM_COLOR_YCBCR_BT709,
-                                               DRM_COLOR_YCBCR_LIMITED_RANGE);
-       if (ret) {
-               dev_err(drm->dev, "Couldn't add encoding and range 
properties!\n");
-               return ERR_PTR(ret);
+               ret = drm_plane_create_color_properties(&layer->plane,
+                                                       supported_encodings,
+                                                       supported_ranges,
+                                                       DRM_COLOR_YCBCR_BT709,
+                                                       
DRM_COLOR_YCBCR_LIMITED_RANGE);
+               if (ret) {
+                       dev_err(drm->dev, "Couldn't add encoding and range 
properties!\n");
+                       return ERR_PTR(ret);
+               }
        }
 
        drm_plane_helper_add(&layer->plane, &sun8i_vi_layer_helper_funcs);
-- 
2.43.0

Reply via email to