From nobody Mon Feb 9 18:43:39 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A022140385; Thu, 22 Feb 2024 18:15:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708625755; cv=none; b=Hi+3eqwNjWC98F5N4PsZFSZYkpY5+k2vJHBKWRdUBY24TrW8XWfCAxc1LuwPvrwy8tfm9Y0XpMav8v+qZiYEkr3SD00D9EVonoKLBnNlMiYx+XFGcaizqJC8/BNLaBEHumffRTWE3PqJsCbhR0+lu/nvQiHtDWEu4EpI4OZmK6g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708625755; c=relaxed/simple; bh=DqZZ+b+mj8mcOmdAL/nGf3tA/KUQeXc7kvO51t7IdCU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VhGlJ1Y8k2JJayrveC3BA2sR2WaVcrG0hdjAcG5p1oUrHJ0tFCc14d7RTx3H0rJyf8JuD8MLHpE6FxvM+CyXVfszZb1t0IQlKTp6SARlN21ObGUStUveuRmPUY6fF0ZdpJfjgy2k3exIIwLRaDJl6FklzkXgn0nmluRyVsjKRYQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LyXbPRYH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LyXbPRYH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD83AC433C7; Thu, 22 Feb 2024 18:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708625755; bh=DqZZ+b+mj8mcOmdAL/nGf3tA/KUQeXc7kvO51t7IdCU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LyXbPRYHZZpqLIB0/HhT3EDTRUZ9hPYNuWO7o6kBzgDsaKpb9M6ZnuKfnMP/5zPC4 r/+Ca8VE6T3hqZG5UEe9/iSKoziOcY1rvAlmeXWYBVgdCH70/QnL8x2OHXTH3uX+tn h8eXVhly3+CJ6oZAGAPpfXz0T6vWFNzsM04BNASbFjNgb+EFo1g/ryqFBuj+BhjLeb UjLaVbviuxiLJNFVKe4SuCoMm0iEhgae/wAcTt2sHvVtbzUwiDCvYngY5uJ3BYmYQg oni7Rf28b5e7UOFdNbEPII3ynHIm5dPHVWy3z5EcyPQtf72QWfD1UERwsp7zRKthLj ALwfZCcC1ggaw== From: Maxime Ripard Date: Thu, 22 Feb 2024 19:14:17 +0100 Subject: [PATCH v7 31/36] drm/rockchip: inno_hdmi: Switch to HDMI connector Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240222-kms-hdmi-connector-state-v7-31-8f4af575fce2@kernel.org> References: <20240222-kms-hdmi-connector-state-v7-0-8f4af575fce2@kernel.org> In-Reply-To: <20240222-kms-hdmi-connector-state-v7-0-8f4af575fce2@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Jonathan Corbet , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: Hans Verkuil , Sebastian Wick , =?utf-8?q?Ville_Syrj=C3=A4l=C3=A4?= , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Maxime Ripard X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=9853; i=mripard@kernel.org; h=from:subject:message-id; bh=DqZZ+b+mj8mcOmdAL/nGf3tA/KUQeXc7kvO51t7IdCU=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDKnX+/4EvE4xL/R8xuje/3nmrc+eIWdaky60hS9Y9vP1e ckox187OkpZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjCRpihGho3/ztrGnvuodrR3 07otiuxS7lrVX884xEzjdZe0jLLx1WZk2BS6me3b2jtbzypl1gu0nL6uvz7jsNzZ8we2BZQnhpd kcAEA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The new HDMI connector infrastructure allows to remove some boilerplate, especially to generate infoframes. Let's switch to it. Signed-off-by: Maxime Ripard Reviewed-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/inno_hdmi.c | 123 ++++++++++++-------------------= ---- 1 file changed, 42 insertions(+), 81 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index 1d2261643743..d59947679042 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -67,9 +67,7 @@ struct inno_hdmi { =20 struct inno_hdmi_connector_state { struct drm_connector_state base; - unsigned int enc_out_format; unsigned int colorimetry; - bool rgb_limited_range; }; =20 static struct inno_hdmi *encoder_to_inno_hdmi(struct drm_encoder *encoder) @@ -257,26 +255,29 @@ static void inno_hdmi_reset(struct inno_hdmi *hdmi) inno_hdmi_standby(hdmi); } =20 -static void inno_hdmi_disable_frame(struct inno_hdmi *hdmi, - enum hdmi_infoframe_type type) +static int inno_hdmi_disable_frame(struct drm_connector *connector, + enum hdmi_infoframe_type type) { - struct drm_connector *connector =3D &hdmi->connector; + struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); =20 if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { drm_err(connector->dev, "Unsupported infoframe type: %u\n", type); - return; + return 0; } =20 hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_BUF_INDEX, INFOFRAME_AVI); + + return 0; } =20 -static int inno_hdmi_upload_frame(struct inno_hdmi *hdmi, - union hdmi_infoframe *frame, enum hdmi_infoframe_type type) +static int inno_hdmi_upload_frame(struct drm_connector *connector, + enum hdmi_infoframe_type type, + const u8 *buffer, size_t len) { - struct drm_connector *connector =3D &hdmi->connector; + struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); u8 packed_frame[HDMI_MAXIMUM_INFO_FRAME_SIZE]; - ssize_t rc, i; + ssize_t i; =20 if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { drm_err(connector->dev, @@ -284,59 +285,19 @@ static int inno_hdmi_upload_frame(struct inno_hdmi *h= dmi, return 0; } =20 - inno_hdmi_disable_frame(hdmi, type); + inno_hdmi_disable_frame(connector, type); =20 - rc =3D hdmi_infoframe_pack(frame, packed_frame, - sizeof(packed_frame)); - if (rc < 0) - return rc; - - for (i =3D 0; i < rc; i++) + for (i =3D 0; i < len; i++) hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_ADDR + i, packed_frame[i]); =20 return 0; } =20 -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; - - rc =3D drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, - &hdmi->connector, - mode); - if (rc) { - inno_hdmi_disable_frame(hdmi, HDMI_INFOFRAME_TYPE_AVI); - return rc; - } - - if (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) - frame.avi.colorspace =3D HDMI_COLORSPACE_YUV444; - 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; - - if (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_RGB) { - drm_hdmi_avi_infoframe_quant_range(&frame.avi, - connector, mode, - inno_conn_state->rgb_limited_range ? - HDMI_QUANTIZATION_RANGE_LIMITED : - HDMI_QUANTIZATION_RANGE_FULL); - } else { - frame.avi.quantization_range =3D HDMI_QUANTIZATION_RANGE_DEFAULT; - frame.avi.ycc_quantization_range =3D - HDMI_YCC_QUANTIZATION_RANGE_LIMITED; - } - - return inno_hdmi_upload_frame(hdmi, &frame, HDMI_INFOFRAME_TYPE_AVI); -} +static const struct drm_connector_hdmi_funcs inno_hdmi_hdmi_connector_func= s =3D { + .clear_infoframe =3D inno_hdmi_disable_frame, + .write_infoframe =3D inno_hdmi_upload_frame, +}; =20 static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi) { @@ -361,8 +322,8 @@ 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 (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_RGB) { - if (inno_conn_state->rgb_limited_range) { + if (conn_state->hdmi.output_format =3D=3D HDMI_COLORSPACE_RGB) { + if (!conn_state->hdmi.is_full_range) { csc_mode =3D CSC_RGB_0_255_TO_RGB_16_235_8BIT; auto_csc =3D AUTO_CSC_DISABLE; c0_c2_change =3D C0_C2_CHANGE_DISABLE; @@ -380,14 +341,14 @@ static int inno_hdmi_config_video_csc(struct inno_hdm= i *hdmi) } } else { if (inno_conn_state->colorimetry =3D=3D HDMI_COLORIMETRY_ITU_601) { - if (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) { + if (conn_state->hdmi.output_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 (inno_conn_state->enc_out_format =3D=3D HDMI_COLORSPACE_YUV444) { + if (conn_state->hdmi.output_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; @@ -462,10 +423,12 @@ static int inno_hdmi_config_video_timing(struct inno_= hdmi *hdmi, } =20 static int inno_hdmi_setup(struct inno_hdmi *hdmi, - struct drm_display_mode *mode) + struct drm_crtc_state *new_crtc_state, + struct drm_connector_state *new_conn_state) { - struct drm_display_info *display =3D &hdmi->connector.display_info; - unsigned long mpixelclock =3D mode->clock * 1000; + struct drm_connector *connector =3D &hdmi->connector; + struct drm_display_info *display =3D &connector->display_info; + struct drm_display_mode *mode =3D &new_crtc_state->adjusted_mode; =20 /* Mute video and audio output */ hdmi_modb(hdmi, HDMI_AV_MUTE, m_AUDIO_MUTE | m_VIDEO_BLACK, @@ -479,8 +442,8 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi, =20 inno_hdmi_config_video_csc(hdmi); =20 - if (display->is_hdmi) - inno_hdmi_config_video_avi(hdmi, mode); + drm_atomic_helper_connector_hdmi_update_infoframes(connector, + new_conn_state->state); =20 /* * When IP controller have configured to an accurate video @@ -488,13 +451,13 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi, * DCLK_LCDC, so we need to init the TMDS rate to mode pixel * clock rate, and reconfigure the DDC clock. */ - inno_hdmi_i2c_init(hdmi, mpixelclock); + inno_hdmi_i2c_init(hdmi, new_conn_state->hdmi.tmds_char_rate); =20 /* Unmute video and audio output */ hdmi_modb(hdmi, HDMI_AV_MUTE, m_AUDIO_MUTE | m_VIDEO_BLACK, v_AUDIO_MUTE(0) | v_VIDEO_MUTE(0)); =20 - inno_hdmi_power_up(hdmi, mpixelclock); + inno_hdmi_power_up(hdmi, new_conn_state->hdmi.tmds_char_rate); =20 return 0; } @@ -546,7 +509,7 @@ static void inno_hdmi_encoder_enable(struct drm_encoder= *encoder, if (WARN_ON(!crtc_state)) return; =20 - inno_hdmi_setup(hdmi, &crtc_state->adjusted_mode); + inno_hdmi_setup(hdmi, crtc_state, conn_state); } =20 static void inno_hdmi_encoder_disable(struct drm_encoder *encoder, @@ -563,7 +526,6 @@ inno_hdmi_encoder_atomic_check(struct drm_encoder *enco= der, struct drm_connector_state *conn_state) { struct rockchip_crtc_state *s =3D to_rockchip_crtc_state(crtc_state); - struct inno_hdmi *hdmi =3D encoder_to_inno_hdmi(encoder); 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 @@ -580,12 +542,7 @@ inno_hdmi_encoder_atomic_check(struct drm_encoder *enc= oder, else inno_conn_state->colorimetry =3D HDMI_COLORIMETRY_ITU_709; =20 - inno_conn_state->enc_out_format =3D HDMI_COLORSPACE_RGB; - inno_conn_state->rgb_limited_range =3D - drm_default_rgb_quant_range(mode) =3D=3D HDMI_QUANTIZATION_RANGE_LIMITED; - - return inno_hdmi_display_mode_valid(hdmi, - &crtc_state->adjusted_mode) =3D=3D MODE_OK ? 0 : -EINVAL; + return 0; } =20 static struct drm_encoder_helper_funcs inno_hdmi_encoder_helper_funcs =3D { @@ -662,10 +619,9 @@ static void inno_hdmi_connector_reset(struct drm_conne= ctor *connector) return; =20 __drm_atomic_helper_connector_reset(connector, &inno_conn_state->base); + __drm_atomic_helper_connector_hdmi_reset(connector, connector->state); =20 inno_conn_state->colorimetry =3D HDMI_COLORIMETRY_ITU_709; - inno_conn_state->enc_out_format =3D HDMI_COLORSPACE_RGB; - inno_conn_state->rgb_limited_range =3D false; } =20 static struct drm_connector_state * @@ -698,6 +654,7 @@ static const struct drm_connector_funcs inno_hdmi_conne= ctor_funcs =3D { }; =20 static struct drm_connector_helper_funcs inno_hdmi_connector_helper_funcs = =3D { + .atomic_check =3D drm_atomic_helper_connector_hdmi_check, .get_modes =3D inno_hdmi_connector_get_modes, .mode_valid =3D inno_hdmi_connector_mode_valid, }; @@ -725,10 +682,14 @@ static int inno_hdmi_register(struct drm_device *drm,= struct inno_hdmi *hdmi) =20 drm_connector_helper_add(&hdmi->connector, &inno_hdmi_connector_helper_funcs); - drm_connector_init_with_ddc(drm, &hdmi->connector, - &inno_hdmi_connector_funcs, - DRM_MODE_CONNECTOR_HDMIA, - hdmi->ddc); + drmm_connector_hdmi_init(drm, &hdmi->connector, + "Rockchip", "Inno HDMI", + &inno_hdmi_connector_funcs, + &inno_hdmi_hdmi_connector_funcs, + DRM_MODE_CONNECTOR_HDMIA, + hdmi->ddc, + BIT(HDMI_COLORSPACE_RGB), + 8); =20 drm_connector_attach_encoder(&hdmi->connector, encoder); =20 --=20 2.43.2