drm/rockchip: inno_hdmi: no need to store vic
authorMaxime Ripard <mripard@kernel.org>
Fri, 22 Dec 2023 17:41:59 +0000 (18:41 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Fri, 29 Dec 2023 23:33:17 +0000 (00:33 +0100)
The mode's VIC is only ever used in the inno_hdmi_setup() function so
there's no need to store it in the main structure.

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-9-knaerzche@gmail.com
drivers/gpu/drm/rockchip/inno_hdmi.c

index 38990a13ee1944f697340c08f9210f6dd95d17fb..437c5dcbab0daa3cdfa2445f3e1fb900c4076964 100644 (file)
@@ -27,7 +27,6 @@
 #include "inno_hdmi.h"
 
 struct hdmi_data_info {
-       int vic;
        bool sink_has_audio;
        unsigned int enc_in_format;
        unsigned int enc_out_format;
@@ -442,16 +441,15 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi,
                           struct drm_display_mode *mode)
 {
        struct drm_display_info *display = &hdmi->connector.display_info;
-
-       hdmi->hdmi_data.vic = drm_match_cea_mode(mode);
+       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 ((hdmi->hdmi_data.vic == 6) || (hdmi->hdmi_data.vic == 7) ||
-           (hdmi->hdmi_data.vic == 21) || (hdmi->hdmi_data.vic == 22) ||
-           (hdmi->hdmi_data.vic == 2) || (hdmi->hdmi_data.vic == 3) ||
-           (hdmi->hdmi_data.vic == 17) || (hdmi->hdmi_data.vic == 18))
+       if (vic == 6 || vic == 7 ||
+           vic == 21 || vic == 22 ||
+           vic == 2 || vic == 3 ||
+           vic == 17 || vic == 18)
                hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_601;
        else
                hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_709;