From nobody Fri Dec 19 09:46:09 2025 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A936E381CF; Fri, 22 Dec 2023 17:42:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YAFRndZi" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-33621d443a7so2019738f8f.3; Fri, 22 Dec 2023 09:42:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703266956; x=1703871756; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nTJLdrH0LrbSbPhi76eSCJAOBnRdB++mitsqsoondcw=; b=YAFRndZi0g13Jf1g2/ncQ66LWlkNdnlNYu9ecbT3C/YTjPFjpZ9UX06V/9mLMi52jL cXLEPpI6FG31C3TX2cl3a65TMycowe7orBPtnZaDBtZGYBfjwzBQmDgp8GlPkg+wZnP1 wxHvf5hDzrLijHOC9K2VsGH3Zy51F4cMrtrRJdh+pjovzYNIaoCIVUx25bbh8XEs7llG IjQxMp+RZGwtcOINMVkXuEynoQ9XiPrznHhAvXPQwBO0+rITmWfcpAtZlscOQFazwLgk 5HswGgPKNBWfnMR7xkFRBndUSWMlnMeOXvwpNLj+eiunoHBbMy0Nz5zpZoWjt84JH0YN ZblQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703266956; x=1703871756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nTJLdrH0LrbSbPhi76eSCJAOBnRdB++mitsqsoondcw=; b=HEBNz5R9Pua7PYym2XWG7zHJCfkjcmd/ntbhd+MSvL+gis3dtB9ywWnQdS4N3Zj7ao c1O6U3YIoGPmpw/ZPr+vglik5kpvIiq+kUtc7oMsmfo6eaN5ASwlJfwEOE1tD9tM2RdR nsTGBjqnLj8YGZ6u0XzeaCAaMCHxpP7K53rDW0Pa9q2WXok9jowidPBcXRtDRKQLg/JE Ft1tk0ms4tRY3SzRwcOui2NsHmVPkDPgK7Zb0g7y4YNm5QLv/ZWBtR230fEN2S0uKSe9 j7P41qsxLIbQuY0p/MfZ0qdBo+2gac7qabY/dnJNtOPg9E7qyy6YzCsMVeVVvHA0zzSW pQmA== X-Gm-Message-State: AOJu0YyM7wOuteVQrGeR8Lcgg+lUGle7feYgF4AAdeWHTiNo+otr6Hfl evJAzzaDS0rXIdc0cgUmGA== X-Google-Smtp-Source: AGHT+IH/eqhhQrbQNb9jDPPXogkNUwK+iKCCinjmR4Spd1WlqPNxfwU5vXPt4aNHH23pnHO1bk0eYA== X-Received: by 2002:adf:b318:0:b0:336:7a35:4115 with SMTP id j24-20020adfb318000000b003367a354115mr868279wrd.0.1703266955745; Fri, 22 Dec 2023 09:42:35 -0800 (PST) Received: from U4.lan ([2a02:810b:f40:4300:f3ae:2788:7e03:f44]) by smtp.gmail.com with ESMTPSA id w10-20020adfec4a000000b00336670abdcasm4777116wrn.40.2023.12.22.09.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 09:42:35 -0800 (PST) From: Alex Bee To: Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH v4 19/29] drm/rockchip: inno_hdmi: Subclass connector state Date: Fri, 22 Dec 2023 18:42:10 +0100 Message-ID: <20231222174220.55249-20-knaerzche@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222174220.55249-1-knaerzche@gmail.com> References: <20231222174220.55249-1-knaerzche@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Alex Bee --- changes in v2: - new patch changes in v3: - added missing customizations of reset and atomic_destroy_state connector= hooks - moved inno_conn_state member assignments to atomic_check changes in v4: - added missing state destroy in reset hook drivers/gpu/drm/rockchip/inno_hdmi.c | 117 ++++++++++++++++++++------- 1 file changed, 90 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index c306db90832a..e43fce968310 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -26,11 +26,6 @@ =20 #include "inno_hdmi.h" =20 -struct hdmi_data_info { - unsigned int enc_out_format; - unsigned int colorimetry; -}; - struct inno_hdmi_i2c { struct i2c_adapter adap; =20 @@ -52,8 +47,12 @@ struct inno_hdmi { =20 struct inno_hdmi_i2c *i2c; struct i2c_adapter *ddc; +}; =20 - struct hdmi_data_info hdmi_data; +struct inno_hdmi_connector_state { + struct drm_connector_state base; + unsigned int enc_out_format; + unsigned int colorimetry; }; =20 static struct inno_hdmi *encoder_to_inno_hdmi(struct drm_encoder *encoder) @@ -68,6 +67,9 @@ static struct inno_hdmi *connector_to_inno_hdmi(struct dr= m_connector *connector) return container_of(connector, struct inno_hdmi, connector); } =20 +#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, @@ -246,6 +248,10 @@ static int inno_hdmi_upload_frame(struct inno_hdmi *hd= mi, static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi, struct drm_display_mode *mode) { + struct drm_connector *connector =3D &hdmi->connector; + struct drm_connector_state *conn_state =3D connector->state; + struct inno_hdmi_connector_state *inno_conn_state =3D + to_inno_hdmi_conn_state(conn_state); union hdmi_infoframe frame; int rc; =20 @@ -257,9 +263,9 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi = *hdmi, return rc; } =20 - if (hdmi->hdmi_data.enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) + if (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) frame.avi.colorspace =3D HDMI_COLORSPACE_YUV444; - else if (hdmi->hdmi_data.enc_out_format =3D=3D HDMI_COLORSPACE_YUV422) + else if (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_YUV422) frame.avi.colorspace =3D HDMI_COLORSPACE_YUV422; else frame.avi.colorspace =3D HDMI_COLORSPACE_RGB; @@ -269,7 +275,10 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi= *hdmi, =20 static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi) { - struct hdmi_data_info *data =3D &hdmi->hdmi_data; + struct drm_connector *connector =3D &hdmi->connector; + struct drm_connector_state *conn_state =3D connector->state; + struct inno_hdmi_connector_state *inno_conn_state =3D + to_inno_hdmi_conn_state(conn_state); int c0_c2_change =3D 0; int csc_enable =3D 0; int csc_mode =3D 0; @@ -287,7 +296,7 @@ static int inno_hdmi_config_video_csc(struct inno_hdmi = *hdmi) v_VIDEO_INPUT_CSP(0); hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL2, value); =20 - if (data->enc_out_format =3D=3D HDMI_COLORSPACE_RGB) { + if (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_RGB) { value =3D v_SOF_DISABLE | v_COLOR_DEPTH_NOT_INDICATED(1); hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL3, value); =20 @@ -298,15 +307,15 @@ static int inno_hdmi_config_video_csc(struct inno_hdm= i *hdmi) return 0; } =20 - if (data->colorimetry =3D=3D HDMI_COLORIMETRY_ITU_601) { - if (data->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) { + if (inno_conn_state->colorimetry =3D=3D HDMI_COLORIMETRY_ITU_601) { + if (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) { csc_mode =3D CSC_RGB_0_255_TO_ITU601_16_235_8BIT; auto_csc =3D AUTO_CSC_DISABLE; c0_c2_change =3D C0_C2_CHANGE_DISABLE; csc_enable =3D v_CSC_ENABLE; } } else { - if (data->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) { + if (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) { csc_mode =3D CSC_RGB_0_255_TO_ITU709_16_235_8BIT; auto_csc =3D AUTO_CSC_DISABLE; c0_c2_change =3D C0_C2_CHANGE_DISABLE; @@ -383,17 +392,6 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi, struct drm_display_mode *mode) { struct drm_display_info *display =3D &hdmi->connector.display_info; - u8 vic =3D drm_match_cea_mode(mode); - - hdmi->hdmi_data.enc_out_format =3D HDMI_COLORSPACE_RGB; - - if (vic =3D=3D 6 || vic =3D=3D 7 || - vic =3D=3D 21 || vic =3D=3D 22 || - vic =3D=3D 2 || vic =3D=3D 3 || - vic =3D=3D 17 || vic =3D=3D 18) - hdmi->hdmi_data.colorimetry =3D HDMI_COLORIMETRY_ITU_601; - else - hdmi->hdmi_data.colorimetry =3D HDMI_COLORIMETRY_ITU_709; =20 /* Mute video and audio output */ hdmi_modb(hdmi, HDMI_AV_MUTE, m_AUDIO_MUTE | m_VIDEO_BLACK, @@ -458,10 +456,24 @@ inno_hdmi_encoder_atomic_check(struct drm_encoder *en= coder, struct drm_connector_state *conn_state) { struct rockchip_crtc_state *s =3D to_rockchip_crtc_state(crtc_state); + struct drm_display_mode *mode =3D &crtc_state->adjusted_mode; + u8 vic =3D drm_match_cea_mode(mode); + struct inno_hdmi_connector_state *inno_conn_state =3D + to_inno_hdmi_conn_state(conn_state); =20 s->output_mode =3D ROCKCHIP_OUT_MODE_P888; s->output_type =3D DRM_MODE_CONNECTOR_HDMIA; =20 + if (vic =3D=3D 6 || vic =3D=3D 7 || + vic =3D=3D 21 || vic =3D=3D 22 || + vic =3D=3D 2 || vic =3D=3D 3 || + vic =3D=3D 17 || vic =3D=3D 18) + inno_conn_state->colorimetry =3D HDMI_COLORIMETRY_ITU_601; + else + inno_conn_state->colorimetry =3D HDMI_COLORIMETRY_ITU_709; + + inno_conn_state->enc_out_format =3D HDMI_COLORSPACE_RGB; + return 0; } =20 @@ -519,13 +531,63 @@ static void inno_hdmi_connector_destroy(struct drm_co= nnector *connector) drm_connector_cleanup(connector); } =20 +static void +inno_hdmi_connector_destroy_state(struct drm_connector *connector, + struct drm_connector_state *state) +{ + struct inno_hdmi_connector_state *inno_conn_state =3D + 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 =3D NULL; + } + + inno_conn_state =3D 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 =3D HDMI_COLORIMETRY_ITU_709; + inno_conn_state->enc_out_format =3D 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 =3D 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 =3D { .fill_modes =3D inno_hdmi_probe_single_connector_modes, .detect =3D inno_hdmi_connector_detect, .destroy =3D inno_hdmi_connector_destroy, - .reset =3D drm_atomic_helper_connector_reset, - .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, - .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, + .reset =3D inno_hdmi_connector_reset, + .atomic_duplicate_state =3D inno_hdmi_connector_duplicate_state, + .atomic_destroy_state =3D inno_hdmi_connector_destroy_state, }; =20 static struct drm_connector_helper_funcs inno_hdmi_connector_helper_funcs = =3D { --=20 2.43.0