drm/rockchip: inno_hdmi: Remove useless input format
authorMaxime Ripard <mripard@kernel.org>
Fri, 22 Dec 2023 17:42:01 +0000 (18:42 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Fri, 29 Dec 2023 23:33:19 +0000 (00:33 +0100)
The driver has a lot of logic to deal with multiple input formats, but
hardcodes it to RGB. This means that most of that code has been dead
code, so let's get rid of it.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
Tested-by: Alex Bee <knaerzche@gmail.com>
[made checkpatch happy]
Signed-off-by: Alex Bee <knaerzche@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231222174220.55249-11-knaerzche@gmail.com
drivers/gpu/drm/rockchip/inno_hdmi.c

index 6120ab8dd8fd183a348be0c7e029923f953b0de2..3cb84943646f833e32c9cf8a8ece64f5bfc33060 100644 (file)
@@ -27,7 +27,6 @@
 #include "inno_hdmi.h"
 
 struct hdmi_data_info {
-       unsigned int enc_in_format;
        unsigned int enc_out_format;
        unsigned int colorimetry;
 };
@@ -327,47 +326,30 @@ static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi)
                v_VIDEO_INPUT_CSP(0);
        hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL2, value);
 
-       if (data->enc_in_format == data->enc_out_format) {
-               if ((data->enc_in_format == HDMI_COLORSPACE_RGB) ||
-                   (data->enc_in_format >= HDMI_COLORSPACE_YUV444)) {
-                       value = v_SOF_DISABLE | v_COLOR_DEPTH_NOT_INDICATED(1);
-                       hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL3, value);
-
-                       hdmi_modb(hdmi, HDMI_VIDEO_CONTRL,
-                                 m_VIDEO_AUTO_CSC | m_VIDEO_C0_C2_SWAP,
-                                 v_VIDEO_AUTO_CSC(AUTO_CSC_DISABLE) |
-                                 v_VIDEO_C0_C2_SWAP(C0_C2_CHANGE_DISABLE));
-                       return 0;
-               }
+       if (data->enc_out_format == HDMI_COLORSPACE_RGB) {
+               value = v_SOF_DISABLE | v_COLOR_DEPTH_NOT_INDICATED(1);
+               hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL3, value);
+
+               hdmi_modb(hdmi, HDMI_VIDEO_CONTRL,
+                         m_VIDEO_AUTO_CSC | m_VIDEO_C0_C2_SWAP,
+                         v_VIDEO_AUTO_CSC(AUTO_CSC_DISABLE) |
+                         v_VIDEO_C0_C2_SWAP(C0_C2_CHANGE_DISABLE));
+               return 0;
        }
 
        if (data->colorimetry == HDMI_COLORIMETRY_ITU_601) {
-               if ((data->enc_in_format == HDMI_COLORSPACE_RGB) &&
-                   (data->enc_out_format == HDMI_COLORSPACE_YUV444)) {
+               if (data->enc_out_format == HDMI_COLORSPACE_YUV444) {
                        csc_mode = CSC_RGB_0_255_TO_ITU601_16_235_8BIT;
                        auto_csc = AUTO_CSC_DISABLE;
                        c0_c2_change = C0_C2_CHANGE_DISABLE;
                        csc_enable = v_CSC_ENABLE;
-               } else if ((data->enc_in_format == HDMI_COLORSPACE_YUV444) &&
-                          (data->enc_out_format == HDMI_COLORSPACE_RGB)) {
-                       csc_mode = CSC_ITU601_16_235_TO_RGB_0_255_8BIT;
-                       auto_csc = AUTO_CSC_ENABLE;
-                       c0_c2_change = C0_C2_CHANGE_DISABLE;
-                       csc_enable = v_CSC_DISABLE;
                }
        } else {
-               if ((data->enc_in_format == HDMI_COLORSPACE_RGB) &&
-                   (data->enc_out_format == HDMI_COLORSPACE_YUV444)) {
+               if (data->enc_out_format == HDMI_COLORSPACE_YUV444) {
                        csc_mode = CSC_RGB_0_255_TO_ITU709_16_235_8BIT;
                        auto_csc = AUTO_CSC_DISABLE;
                        c0_c2_change = C0_C2_CHANGE_DISABLE;
                        csc_enable = v_CSC_ENABLE;
-               } else if ((data->enc_in_format == HDMI_COLORSPACE_YUV444) &&
-                          (data->enc_out_format == HDMI_COLORSPACE_RGB)) {
-                       csc_mode = CSC_ITU709_16_235_TO_RGB_0_255_8BIT;
-                       auto_csc = AUTO_CSC_ENABLE;
-                       c0_c2_change = C0_C2_CHANGE_DISABLE;
-                       csc_enable = v_CSC_DISABLE;
                }
        }
 
@@ -442,7 +424,6 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi,
        struct drm_display_info *display = &hdmi->connector.display_info;
        u8 vic = drm_match_cea_mode(mode);
 
-       hdmi->hdmi_data.enc_in_format = HDMI_COLORSPACE_RGB;
        hdmi->hdmi_data.enc_out_format = HDMI_COLORSPACE_RGB;
 
        if (vic == 6 || vic == 7 ||