drm/sun4i: csc: Simplify arguments with taking plane state

Taking plane state directly reduces number of arguments, avoids copying
values and allows making additional decisions. For example, when plane
is disabled, CSC should be turned off.

This is also cleanup for later patches which will move call to another
place.

Reviewed-by: Chen-Yu Tsai <wens@kernel.org>
Tested-by: Ryan Walklin <ryan@testtoast.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Link: https://patch.msgid.link/20251104180942.61538-13-jernej.skrabec@gmail.com
Signed-off-by: Chen-Yu Tsai <wens@kernel.org>

diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.c b/drivers/gpu/drm/sun4i/sun8i_csc.c
index cf0c5121661b584fba7bdaec8eebe014323a8099..ac7b62adc7df64f5a55bb272d6024c753b3b8c4c 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_csc.c
+++ b/drivers/gpu/drm/sun4i/sun8i_csc.c
@@ -3,11 +3,20 @@
  * Copyright (C) Jernej Skrabec <jernej.skrabec@siol.net>
  */
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_framebuffer.h>
+#include <drm/drm_plane.h>
 #include <drm/drm_print.h>
 
 #include "sun8i_csc.h"
 #include "sun8i_mixer.h"
 
+enum sun8i_csc_mode {
+       SUN8I_CSC_MODE_OFF,
+       SUN8I_CSC_MODE_YUV2RGB,
+       SUN8I_CSC_MODE_YVU2RGB,
+};
+
 static const u32 ccsc_base[][2] = {
        [CCSC_MIXER0_LAYOUT]    = {CCSC00_OFFSET, CCSC01_OFFSET},
        [CCSC_MIXER1_LAYOUT]    = {CCSC10_OFFSET, CCSC11_OFFSET},
@@ -196,21 +205,44 @@ static void sun8i_de3_ccsc_setup(struct regmap *map, int layer,
                           mask, val);
 }
 
+static u32 sun8i_csc_get_mode(struct drm_plane_state *state)
+{
+       const struct drm_format_info *format;
+
+       if (!state->crtc || !state->visible)
+               return SUN8I_CSC_MODE_OFF;
+
+       format = state->fb->format;
+       if (!format->is_yuv)
+               return SUN8I_CSC_MODE_OFF;
+
+       switch (format->format) {
+       case DRM_FORMAT_YVU411:
+       case DRM_FORMAT_YVU420:
+       case DRM_FORMAT_YVU422:
+       case DRM_FORMAT_YVU444:
+               return SUN8I_CSC_MODE_YVU2RGB;
+       default:
+               return SUN8I_CSC_MODE_YUV2RGB;
+       }
+}
+
 void sun8i_csc_config(struct sun8i_mixer *mixer, int layer,
-                     enum sun8i_csc_mode mode,
-                     enum drm_color_encoding encoding,
-                     enum drm_color_range range)
+                     struct drm_plane_state *state)
 {
+       u32 mode = sun8i_csc_get_mode(state);
        u32 base;
 
        if (mixer->cfg->de_type == SUN8I_MIXER_DE3) {
                sun8i_de3_ccsc_setup(mixer->engine.regs, layer,
-                                    mode, encoding, range);
+                                    mode, state->color_encoding,
+                                    state->color_range);
                return;
        }
 
        base = ccsc_base[mixer->cfg->ccsc][layer];
 
        sun8i_csc_setup(mixer->engine.regs, base,
-                       mode, encoding, range);
+                       mode, state->color_encoding,
+                       state->color_range);
 }

diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.h b/drivers/gpu/drm/sun4i/sun8i_csc.h
index 27b6807fc7863d417f144019c509c597cd28a2ba..ce921521aaca35bf90f33391a1b67a20b00d3118 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_csc.h
+++ b/drivers/gpu/drm/sun4i/sun8i_csc.h
@@ -8,6 +8,7 @@
 
 #include <drm/drm_color_mgmt.h>
 
+struct drm_plane_state;
 struct sun8i_mixer;
 
 /* VI channel CSC units offsets */
@@ -22,15 +23,7 @@ struct sun8i_mixer;
 
 #define SUN8I_CSC_CTRL_EN              BIT(0)
 
-enum sun8i_csc_mode {
-       SUN8I_CSC_MODE_OFF,
-       SUN8I_CSC_MODE_YUV2RGB,
-       SUN8I_CSC_MODE_YVU2RGB,
-};
-
 void sun8i_csc_config(struct sun8i_mixer *mixer, int layer,
-                     enum sun8i_csc_mode mode,
-                     enum drm_color_encoding encoding,
-                     enum drm_color_range range);
+                     struct drm_plane_state *state);
 
 #endif

diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index 0f21da8fe38fd17de4ae3c8999859ab001c4bc64..511a599f31122ab4f5905b688321e19629a8615b 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -189,36 +189,6 @@ static void sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
                     SUN8I_MIXER_CHAN_VI_DS_M(vm));
 }
 
-static u32 sun8i_vi_layer_get_csc_mode(const struct drm_format_info *format)
-{
-       if (!format->is_yuv)
-               return SUN8I_CSC_MODE_OFF;
-
-       switch (format->format) {
-       case DRM_FORMAT_YVU411:
-       case DRM_FORMAT_YVU420:
-       case DRM_FORMAT_YVU422:
-       case DRM_FORMAT_YVU444:
-               return SUN8I_CSC_MODE_YVU2RGB;
-       default:
-               return SUN8I_CSC_MODE_YUV2RGB;
-       }
-}
-
-static void sun8i_vi_layer_update_colors(struct sun8i_mixer *mixer, int channel,
-                                        int overlay, struct drm_plane *plane)
-{
-       struct drm_plane_state *state = plane->state;
-       const struct drm_format_info *fmt;
-       u32 csc_mode;
-
-       fmt = state->fb->format;
-       csc_mode = sun8i_vi_layer_get_csc_mode(fmt);
-       sun8i_csc_config(mixer, channel, csc_mode,
-                        state->color_encoding,
-                        state->color_range);
-}
-
 static void sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
                                         int overlay, struct drm_plane *plane)
 {
@@ -333,8 +303,7 @@ static void sun8i_vi_layer_atomic_update(struct drm_plane *plane,
                                         layer->overlay, plane);
        sun8i_vi_layer_update_coord(mixer, layer->channel,
                                    layer->overlay, plane);
-       sun8i_vi_layer_update_colors(mixer, layer->channel,
-                                    layer->overlay, plane);
+       sun8i_csc_config(mixer, layer->channel, new_state);
        sun8i_vi_layer_update_buffer(mixer, layer->channel,
                                     layer->overlay, plane);
 }