drm/rockchip: inno_hdmi: Subclass connector state

The data which is currently hold in hdmi_data should not be part of device
itself but of the connector state.
Introduce a connector state subclass and move the data from hdmi_data in
there.

Suggested-by: Maxime Ripard <mripard@kernel.org>
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-20-knaerzche@gmail.com

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 9fb1e49bc90918b9138482c20632a90ce6ca7fbd..c6a4b228ea93d7a1bc46b9bde12772f6015891c4 100644 (file)
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -25,11 +25,6 @@
 
 #include "inno_hdmi.h"
 
-struct hdmi_data_info {
-       unsigned int enc_out_format;
-       unsigned int colorimetry;
-};
-
 struct inno_hdmi_i2c {
        struct i2c_adapter adap;
 
@@ -51,8 +46,12 @@ struct inno_hdmi {
 
        struct inno_hdmi_i2c *i2c;
        struct i2c_adapter *ddc;
+};
 
-       struct hdmi_data_info   hdmi_data;
+struct inno_hdmi_connector_state {
+       struct drm_connector_state      base;
+       unsigned int                    enc_out_format;
+       unsigned int                    colorimetry;
 };
 
 static struct inno_hdmi *encoder_to_inno_hdmi(struct drm_encoder *encoder)
@@ -67,6 +66,9 @@ static struct inno_hdmi *connector_to_inno_hdmi(struct drm_connector *connector)
        return container_of(connector, struct inno_hdmi, connector);
 }
 
+#define to_inno_hdmi_conn_state(conn_state) \
+       container_of_const(conn_state, struct inno_hdmi_connector_state, base)
+
 enum {
        CSC_RGB_0_255_TO_ITU601_16_235_8BIT,
        CSC_RGB_0_255_TO_ITU709_16_235_8BIT,
@@ -245,6 +247,10 @@ static int inno_hdmi_upload_frame(struct inno_hdmi *hdmi,
 static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi,
                                      struct drm_display_mode *mode)
 {
+       struct drm_connector *connector = &hdmi->connector;
+       struct drm_connector_state *conn_state = connector->state;
+       struct inno_hdmi_connector_state *inno_conn_state =
+                                       to_inno_hdmi_conn_state(conn_state);
        union hdmi_infoframe frame;
        int rc;
 
@@ -256,9 +262,9 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi,
                return rc;
        }
 
-       if (hdmi->hdmi_data.enc_out_format == HDMI_COLORSPACE_YUV444)
+       if (inno_conn_state->enc_out_format == HDMI_COLORSPACE_YUV444)
                frame.avi.colorspace = HDMI_COLORSPACE_YUV444;
-       else if (hdmi->hdmi_data.enc_out_format == HDMI_COLORSPACE_YUV422)
+       else if (inno_conn_state->enc_out_format == HDMI_COLORSPACE_YUV422)
                frame.avi.colorspace = HDMI_COLORSPACE_YUV422;
        else
                frame.avi.colorspace = HDMI_COLORSPACE_RGB;
@@ -268,7 +274,10 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi,
 
 static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi)
 {
-       struct hdmi_data_info *data = &hdmi->hdmi_data;
+       struct drm_connector *connector = &hdmi->connector;
+       struct drm_connector_state *conn_state = connector->state;
+       struct inno_hdmi_connector_state *inno_conn_state =
+                                       to_inno_hdmi_conn_state(conn_state);
        int c0_c2_change = 0;
        int csc_enable = 0;
        int csc_mode = 0;
@@ -286,7 +295,7 @@ 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_out_format == HDMI_COLORSPACE_RGB) {
+       if (inno_conn_state->enc_out_format == HDMI_COLORSPACE_RGB) {
                value = v_SOF_DISABLE | v_COLOR_DEPTH_NOT_INDICATED(1);
                hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL3, value);
 
@@ -297,15 +306,15 @@ static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi)
                return 0;
        }
 
-       if (data->colorimetry == HDMI_COLORIMETRY_ITU_601) {
-               if (data->enc_out_format == HDMI_COLORSPACE_YUV444) {
+       if (inno_conn_state->colorimetry == HDMI_COLORIMETRY_ITU_601) {
+               if (inno_conn_state->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_out_format == HDMI_COLORSPACE_YUV444) {
+               if (inno_conn_state->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;
@@ -382,17 +391,6 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi,
                           struct drm_display_mode *mode)
 {
        struct drm_display_info *display = &hdmi->connector.display_info;
-       u8 vic = drm_match_cea_mode(mode);
-
-       hdmi->hdmi_data.enc_out_format = HDMI_COLORSPACE_RGB;
-
-       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;
 
        /* Mute video and audio output */
        hdmi_modb(hdmi, HDMI_AV_MUTE, m_AUDIO_MUTE | m_VIDEO_BLACK,
@@ -457,10 +455,24 @@ inno_hdmi_encoder_atomic_check(struct drm_encoder *encoder,
                               struct drm_connector_state *conn_state)
 {
        struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);
+       struct drm_display_mode *mode = &crtc_state->adjusted_mode;
+       u8 vic = drm_match_cea_mode(mode);
+       struct inno_hdmi_connector_state *inno_conn_state =
+                                       to_inno_hdmi_conn_state(conn_state);
 
        s->output_mode = ROCKCHIP_OUT_MODE_P888;
        s->output_type = DRM_MODE_CONNECTOR_HDMIA;
 
+       if (vic == 6 || vic == 7 ||
+           vic == 21 || vic == 22 ||
+           vic == 2 || vic == 3 ||
+           vic == 17 || vic == 18)
+               inno_conn_state->colorimetry = HDMI_COLORIMETRY_ITU_601;
+       else
+               inno_conn_state->colorimetry = HDMI_COLORIMETRY_ITU_709;
+
+       inno_conn_state->enc_out_format = HDMI_COLORSPACE_RGB;
+
        return 0;
 }
 
@@ -518,13 +530,63 @@ static void inno_hdmi_connector_destroy(struct drm_connector *connector)
        drm_connector_cleanup(connector);
 }
 
+static void
+inno_hdmi_connector_destroy_state(struct drm_connector *connector,
+                                 struct drm_connector_state *state)
+{
+       struct inno_hdmi_connector_state *inno_conn_state =
+                                               to_inno_hdmi_conn_state(state);
+
+       __drm_atomic_helper_connector_destroy_state(&inno_conn_state->base);
+       kfree(inno_conn_state);
+}
+
+static void inno_hdmi_connector_reset(struct drm_connector *connector)
+{
+       struct inno_hdmi_connector_state *inno_conn_state;
+
+       if (connector->state) {
+               inno_hdmi_connector_destroy_state(connector, connector->state);
+               connector->state = NULL;
+       }
+
+       inno_conn_state = kzalloc(sizeof(*inno_conn_state), GFP_KERNEL);
+       if (!inno_conn_state)
+               return;
+
+       __drm_atomic_helper_connector_reset(connector, &inno_conn_state->base);
+
+       inno_conn_state->colorimetry = HDMI_COLORIMETRY_ITU_709;
+       inno_conn_state->enc_out_format = HDMI_COLORSPACE_RGB;
+}
+
+static struct drm_connector_state *
+inno_hdmi_connector_duplicate_state(struct drm_connector *connector)
+{
+       struct inno_hdmi_connector_state *inno_conn_state;
+
+       if (WARN_ON(!connector->state))
+               return NULL;
+
+       inno_conn_state = kmemdup(to_inno_hdmi_conn_state(connector->state),
+                                 sizeof(*inno_conn_state), GFP_KERNEL);
+
+       if (!inno_conn_state)
+               return NULL;
+
+       __drm_atomic_helper_connector_duplicate_state(connector,
+                                                     &inno_conn_state->base);
+
+       return &inno_conn_state->base;
+}
+
 static const struct drm_connector_funcs inno_hdmi_connector_funcs = {
        .fill_modes = inno_hdmi_probe_single_connector_modes,
        .detect = inno_hdmi_connector_detect,
        .destroy = inno_hdmi_connector_destroy,
-       .reset = drm_atomic_helper_connector_reset,
-       .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-       .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+       .reset = inno_hdmi_connector_reset,
+       .atomic_duplicate_state = inno_hdmi_connector_duplicate_state,
+       .atomic_destroy_state = inno_hdmi_connector_destroy_state,
 };
 
 static struct drm_connector_helper_funcs inno_hdmi_connector_helper_funcs = {