From nobody Mon Feb 9 09:32:26 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 BF9CF142648; Tue, 26 Mar 2024 15:41:47 +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=1711467707; cv=none; b=QWOoBMGNwoD7eEBcQoSaqgwqKKVSECIXTU6fAqTxbKVjcRrS2bZmNukk93oK0Ego9L5czVGVIQ41E1uf5w/PanUMpmqtoUylLjX3o40uw579jKsIad1Z9T6eiCKWrVfG9Hb74NAD548Md3EZo/ueb8BgAecj52Miv1Q4A9lrHo4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711467707; c=relaxed/simple; bh=xIbiuAlARx4A1tlzwoleuyEcPO3yXffIj083IJynR8o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZI/DrZOpz0cBibLVitEgeTiKmZUWmQy0FrE3078cHESSQbjeNFcq3KedbJ9I9Zpaaeli0ORnhD0nbDavGviquDH7bU50VBgybFoZ/7eSWbOUZYpUhxfrH0JOokMVEGaS0j5To85G6mohINPghopQV5Bb0rDLVkHD5ErAkICFGTE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Mi9qZoxv; 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="Mi9qZoxv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F30AC433A6; Tue, 26 Mar 2024 15:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711467707; bh=xIbiuAlARx4A1tlzwoleuyEcPO3yXffIj083IJynR8o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Mi9qZoxvQOtdFJxWDpX52vq+vUAbNljsNyLeyDHJlyk5inMMdPP3LFbhGu6cCTQmt oEsHYaAlnu/5HkDT5Vn9frlJwbDCskM5hUyf3UG4rVegnxcIvTKS05vp9W6iObauIf 1xuovzAbYaN1YqwpsW72rp5xuWJnuMxU+81dDsfcjqz9c0Lr6IUaa+gIEecMDRx915 Ahaed3NeLxPf9x0txNIv4uvs60RTW92g6DzlyXzkxvYm9gbcxBBWXmhdYmiEX3UtB+ saARHcPw0cp8CO8f9Z1jKzgcgBZOUSA7BZI3UKPZ/OvTrZUav/l7GQfWqGz9ltSeFL UxRxQyvCblaxg== From: Maxime Ripard Date: Tue, 26 Mar 2024 16:40:31 +0100 Subject: [PATCH v11 27/28] 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: <20240326-kms-hdmi-connector-state-v11-27-c5680ffcf261@kernel.org> References: <20240326-kms-hdmi-connector-state-v11-0-c5680ffcf261@kernel.org> In-Reply-To: <20240326-kms-hdmi-connector-state-v11-0-c5680ffcf261@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=12455; i=mripard@kernel.org; h=from:subject:message-id; bh=xIbiuAlARx4A1tlzwoleuyEcPO3yXffIj083IJynR8o=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDGlMb7LXPc3dq947X6myfxHrLJ5uj11/A3rfNEUe1tuZY F4Wtfx9x1QWBmFOBlkxRZYnMmGnl7cvrnKwX/kDZg4rE8gQBi5OAZiIzH/GeldGtqcbZfYkO+19 XHl5/5X11w0TzhyPOXk3bNWm+ZFHT911PirW6D5jxRXtT5cC5WT8JBnr8xef+31IckHUuSXNh9d +yTr2c92rhLKC0tgj11VXCajf/7bt1+VvjQ2JqoyPl03pORslDwA= 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. Reviewed-by: Heiko Stuebner Acked-by: Heiko Stuebner Signed-off-by: Maxime Ripard --- drivers/gpu/drm/rockchip/Kconfig | 1 + drivers/gpu/drm/rockchip/inno_hdmi.c | 143 +++++++++++++------------------= ---- 2 files changed, 53 insertions(+), 91 deletions(-) diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kc= onfig index 04300e5c6d14..82e04cebd108 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -72,10 +72,11 @@ config ROCKCHIP_DW_MIPI_DSI enable MIPI DSI on RK3288 or RK3399 based SoC, you should select this option. =20 config ROCKCHIP_INNO_HDMI bool "Rockchip specific extensions for Innosilicon HDMI" + depends on DRM_HDMI_STATE_HELPER help This selects support for Rockchip SoC specific extensions for the Innosilicon HDMI driver. If you want to enable HDMI on RK3036 based SoC, you should select this option. =20 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 @@ -65,13 +65,11 @@ struct inno_hdmi { const struct inno_hdmi_variant *variant; }; =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) { struct rockchip_encoder *rkencoder =3D to_rockchip_encoder(encoder); @@ -255,90 +253,53 @@ static void inno_hdmi_reset(struct inno_hdmi *hdmi) hdmi_modb(hdmi, HDMI_SYS_CTRL, msk, val); =20 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; - - if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { - drm_err(connector->dev, - "Unsupported infoframe type: %u\n", type); - return; - } - - hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_BUF_INDEX, INFOFRAME_AVI); -} - -static int inno_hdmi_upload_frame(struct inno_hdmi *hdmi, - union hdmi_infoframe *frame, enum hdmi_infoframe_type type) -{ - struct drm_connector *connector =3D &hdmi->connector; - u8 packed_frame[HDMI_MAXIMUM_INFO_FRAME_SIZE]; - ssize_t rc, i; + 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 0; } =20 - inno_hdmi_disable_frame(hdmi, type); + hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_BUF_INDEX, INFOFRAME_AVI); =20 - rc =3D hdmi_infoframe_pack(frame, packed_frame, - sizeof(packed_frame)); - if (rc < 0) - return rc; + return 0; +} =20 - for (i =3D 0; i < rc; i++) +static int inno_hdmi_upload_frame(struct drm_connector *connector, + enum hdmi_infoframe_type type, + const u8 *buffer, size_t len) +{ + struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); + u8 packed_frame[HDMI_MAXIMUM_INFO_FRAME_SIZE]; + ssize_t i; + + if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { + drm_err(connector->dev, + "Unsupported infoframe type: %u\n", type); + return 0; + } + + inno_hdmi_disable_frame(connector, type); + + 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) { struct drm_connector *connector =3D &hdmi->connector; struct drm_connector_state *conn_state =3D connector->state; @@ -359,12 +320,12 @@ static int inno_hdmi_config_video_csc(struct inno_hdm= i *hdmi) value =3D v_VIDEO_INPUT_BITS(VIDEO_INPUT_8BITS) | v_VIDEO_OUTPUT_COLOR(0) | 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; csc_enable =3D v_CSC_ENABLE; =20 @@ -378,18 +339,18 @@ static int inno_hdmi_config_video_csc(struct inno_hdm= i *hdmi) v_VIDEO_C0_C2_SWAP(C0_C2_CHANGE_DISABLE)); return 0; } } 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; csc_enable =3D v_CSC_ENABLE; } @@ -460,14 +421,16 @@ static int inno_hdmi_config_video_timing(struct inno_= hdmi *hdmi, =20 return 0; } =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, v_AUDIO_MUTE(1) | v_VIDEO_MUTE(1)); =20 @@ -477,26 +440,26 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi, =20 inno_hdmi_config_video_timing(hdmi, mode); =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 * timing, then the TMDS clock source would be switched to * 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; } =20 static enum drm_mode_status inno_hdmi_display_mode_valid(struct inno_hdmi = *hdmi, @@ -544,11 +507,11 @@ static void inno_hdmi_encoder_enable(struct drm_encod= er *encoder, =20 crtc_state =3D drm_atomic_get_new_crtc_state(state, conn_state->crtc); 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, struct drm_atomic_state *state) { @@ -561,11 +524,10 @@ static int inno_hdmi_encoder_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, 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 to_inno_hdmi_conn_state(conn_state); =20 @@ -578,16 +540,11 @@ inno_hdmi_encoder_atomic_check(struct drm_encoder *en= coder, 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; =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 { .atomic_check =3D inno_hdmi_encoder_atomic_check, .atomic_enable =3D inno_hdmi_encoder_enable, @@ -660,14 +617,13 @@ static void inno_hdmi_connector_reset(struct drm_conn= ector *connector) inno_conn_state =3D kzalloc(sizeof(*inno_conn_state), GFP_KERNEL); if (!inno_conn_state) 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 * inno_hdmi_connector_duplicate_state(struct drm_connector *connector) { @@ -696,10 +652,11 @@ static const struct drm_connector_funcs inno_hdmi_con= nector_funcs =3D { .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 { + .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, }; =20 static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hd= mi) @@ -723,14 +680,18 @@ static int inno_hdmi_register(struct drm_device *drm,= struct inno_hdmi *hdmi) =20 hdmi->connector.polled =3D DRM_CONNECTOR_POLL_HPD; =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 return 0; } --=20 2.44.0