drm/vc4: hdmi: Add a function to retrieve the CSC matrix

The CSC matrix to use depends on the output format, its range and the
colorspace.

Since we're going to add more colorspaces, let's move the CSC matrix
retrieval to a function.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20221207-rpi-hdmi-improvements-v3-7-bdd54f66884e@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 97ac87a..5c1c130 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1302,6 +1302,20 @@ static void vc5_hdmi_set_csc_coeffs_swap(struct vc4_hdmi *vc4_hdmi,
        HDMI_WRITE(HDMI_CSC_34_33, (coeffs[0][3] << 16) | coeffs[0][2]);
 }
 
+static const u16
+(*vc5_hdmi_find_yuv_csc_coeffs(struct vc4_hdmi *vc4_hdmi, u32 colorspace, bool limited))[4]
+{
+       switch (colorspace) {
+       default:
+       case DRM_MODE_COLORIMETRY_NO_DATA:
+       case DRM_MODE_COLORIMETRY_BT709_YCC:
+       case DRM_MODE_COLORIMETRY_XVYCC_709:
+       case DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED:
+       case DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT:
+               return vc5_hdmi_csc_full_rgb_to_yuv_bt709[limited];
+       }
+}
+
 static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
                               struct drm_connector_state *state,
                               const struct drm_display_mode *mode)
@@ -1311,6 +1325,7 @@ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
                conn_state_to_vc4_hdmi_conn_state(state);
        unsigned int lim_range = vc4_hdmi_is_full_range(vc4_hdmi, vc4_state) ? 0 : 1;
        unsigned long flags;
+       const u16 (*csc)[4];
        u32 if_cfg = 0;
        u32 if_xbar = 0x543210;
        u32 csc_chan_ctl = 0;
@@ -1325,11 +1340,14 @@ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
 
        switch (vc4_state->output_format) {
        case VC4_HDMI_OUTPUT_YUV444:
-               vc5_hdmi_set_csc_coeffs_swap(vc4_hdmi,
-                                            vc5_hdmi_csc_full_rgb_to_yuv_bt709[lim_range]);
+               csc = vc5_hdmi_find_yuv_csc_coeffs(vc4_hdmi, state->colorspace, !!lim_range);
+
+               vc5_hdmi_set_csc_coeffs_swap(vc4_hdmi, csc);
                break;
 
        case VC4_HDMI_OUTPUT_YUV422:
+               csc = vc5_hdmi_find_yuv_csc_coeffs(vc4_hdmi, state->colorspace, !!lim_range);
+
                csc_ctl |= VC4_SET_FIELD(VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422_STANDARD,
                                         VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422) |
                        VC5_MT_CP_CSC_CTL_USE_444_TO_422 |
@@ -1341,7 +1359,7 @@ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
                if_cfg |= VC4_SET_FIELD(VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422_FORMAT_422_LEGACY,
                                        VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422);
 
-               vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_yuv_bt709[lim_range]);
+               vc5_hdmi_set_csc_coeffs(vc4_hdmi, csc);
                break;
 
        case VC4_HDMI_OUTPUT_RGB: