From: "Andy Yan" <andyshrk@163.com>
To: "Maxime Ripard" <mripard@kernel.org>
Cc: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Jonathan Corbet" <corbet@lwn.net>,
"Sandy Huang" <hjc@rock-chips.com>,
"Heiko Stübner" <heiko@sntech.de>, "Chen-Yu Tsai" <wens@csie.org>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Samuel Holland" <samuel@sholland.org>,
"Andy Yan" <andy.yan@rock-chips.com>,
"Hans Verkuil" <hverkuil@xs4all.nl>,
"Sebastian Wick" <sebastian.wick@redhat.com>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
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
Subject: Re:[PATCH v13 27/28] drm/rockchip: inno_hdmi: Switch to HDMI connector
Date: Sun, 12 May 2024 16:29:47 +0800 (CST) [thread overview]
Message-ID: <2d3073ce.16e2.18f6bec1d61.Coremail.andyshrk@163.com> (raw)
In-Reply-To: <20240507-kms-hdmi-connector-state-v13-27-8fafc5efe8be@kernel.org>
Hi Maxime,
At 2024-05-07 21:17:45, "Maxime Ripard" <mripard@kernel.org> wrote:
>The new HDMI connector infrastructure allows to remove some boilerplate,
>especially to generate infoframes. Let's switch to it.
>
>Reviewed-by: Heiko Stuebner <heiko@sntech.de>
>Acked-by: Heiko Stuebner <heiko@sntech.de>
>Signed-off-by: Maxime Ripard <mripard@kernel.org>
>---
> drivers/gpu/drm/rockchip/Kconfig | 3 +
> drivers/gpu/drm/rockchip/inno_hdmi.c | 153 ++++++++++++---------------------
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 3 +
> 3 files changed, 61 insertions(+), 98 deletions(-)
>
>diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
>index 1bf3e2829cd0..7df875e38517 100644
>--- a/drivers/gpu/drm/rockchip/Kconfig
>+++ b/drivers/gpu/drm/rockchip/Kconfig
>@@ -72,10 +72,13 @@ config ROCKCHIP_DW_MIPI_DSI
> enable MIPI DSI on RK3288 or RK3399 based SoC, you should
> select this option.
>
> config ROCKCHIP_INNO_HDMI
> bool "Rockchip specific extensions for Innosilicon HDMI"
>+ select DRM_DISPLAY_HDMI_HELPER
>+ select DRM_DISPLAY_HDMI_STATE_HELPER
>+ select DRM_DISPLAY_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.
>
>diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
>index 3df2cfcf9998..5069403c3b80 100644
>--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
>+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
>@@ -20,10 +20,13 @@
> #include <drm/drm_edid.h>
> #include <drm/drm_of.h>
> #include <drm/drm_probe_helper.h>
> #include <drm/drm_simple_kms_helper.h>
>
>+#include <drm/display/drm_hdmi_helper.h>
>+#include <drm/display/drm_hdmi_state_helper.h>
>+
......
>
> static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi)
> {
> struct drm_connector *connector = &hdmi->connector;
> struct drm_connector_state *conn_state = connector->state;
>@@ -359,12 +323,12 @@ static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi)
> value = v_VIDEO_INPUT_BITS(VIDEO_INPUT_8BITS) |
> v_VIDEO_OUTPUT_COLOR(0) |
> v_VIDEO_INPUT_CSP(0);
> hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL2, value);
>
>- if (inno_conn_state->enc_out_format == HDMI_COLORSPACE_RGB) {
>- if (inno_conn_state->rgb_limited_range) {
>+ if (conn_state->hdmi.output_format == HDMI_COLORSPACE_RGB) {
>+ if (conn_state->hdmi.is_limited_range) {
> csc_mode = CSC_RGB_0_255_TO_RGB_16_235_8BIT;
> auto_csc = AUTO_CSC_DISABLE;
> c0_c2_change = C0_C2_CHANGE_DISABLE;
> csc_enable = v_CSC_ENABLE;
>
>@@ -378,18 +342,18 @@ static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi)
> v_VIDEO_C0_C2_SWAP(C0_C2_CHANGE_DISABLE));
> return 0;
> }
> } else {
> if (inno_conn_state->colorimetry == HDMI_COLORIMETRY_ITU_601) {
>- if (inno_conn_state->enc_out_format == HDMI_COLORSPACE_YUV444) {
>+ if (conn_state->hdmi.output_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 (inno_conn_state->enc_out_format == HDMI_COLORSPACE_YUV444) {
>+ if (conn_state->hdmi.output_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;
> csc_enable = v_CSC_ENABLE;
> }
>@@ -460,14 +424,16 @@ static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi,
>
> return 0;
> }
>
> 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 = &hdmi->connector.display_info;
>- unsigned long mpixelclock = mode->clock * 1000;
>+ struct drm_connector *connector = &hdmi->connector;
>+ struct drm_display_info *display = &connector->display_info;
>+ struct drm_display_mode *mode = &new_crtc_state->adjusted_mode;
>
> /* 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));
>
>@@ -477,26 +443,26 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi,
>
> inno_hdmi_config_video_timing(hdmi, mode);
>
> inno_hdmi_config_video_csc(hdmi);
>
>- if (display->is_hdmi)
>- inno_hdmi_config_video_avi(hdmi, mode);
>+ drm_atomic_helper_connector_hdmi_update_infoframes(connector,
>+ new_conn_state->state);
>
new_conn_state->state will be set NULL in drm_atomic_helper_swap_state,
so this will cause a NULL pointer reference panic here.
> /*
> * 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);
>
> /* 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));
>
>- inno_hdmi_power_up(hdmi, mpixelclock);
>+ inno_hdmi_power_up(hdmi, new_conn_state->hdmi.tmds_char_rate);
>
> return 0;
> }
>
>--
>2.45.0
>
>
>_______________________________________________
>linux-arm-kernel mailing list
>linux-arm-kernel@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-05-12 8:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 13:17 [PATCH v13 00/28] drm/connector: Create HDMI Connector infrastructure Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 01/28] drm/connector: Introduce an HDMI connector initialization function Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 02/28] drm/mode_object: Export drm_mode_obj_find_prop_id for tests Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 03/28] drm/tests: connector: Add tests for drmm_connector_hdmi_init Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 04/28] drm/connector: hdmi: Create an HDMI sub-state Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 05/28] drm/connector: hdmi: Add output BPC to the connector state Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 06/28] drm/tests: Add output bpc tests Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 07/28] drm/connector: hdmi: Add support for output format Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 08/28] drm/tests: Add output formats tests Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 09/28] drm/display: hdmi: Add HDMI compute clock helper Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 10/28] drm/tests: Add HDMI TDMS character rate tests Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 11/28] drm/connector: hdmi: Calculate TMDS character rate Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 12/28] drm/tests: Add TDMS character rate connector state tests Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 13/28] drm/connector: hdmi: Add custom hook to filter TMDS character rate Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 14/28] drm/tests: Add HDMI connector rate filter hook tests Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 15/28] drm/connector: hdmi: Compute bpc and format automatically Maxime Ripard
2024-05-12 8:18 ` Andy Yan
2024-05-16 9:45 ` [PATCH " Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 16/28] drm/tests: Add HDMI connector bpc and format tests Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 17/28] drm/connector: hdmi: Add Broadcast RGB property Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 18/28] drm/tests: Add tests for " Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 19/28] drm/connector: hdmi: Add RGB Quantization Range to the connector state Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 20/28] drm/tests: Add RGB Quantization tests Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 21/28] drm/connector: hdmi: Add Infoframes generation Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 22/28] drm/tests: Add infoframes test Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 23/28] drm/connector: hdmi: Create Infoframe DebugFS entries Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 24/28] drm/vc4: hdmi: Switch to HDMI connector Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 25/28] drm/vc4: tests: Remove vc4_dummy_plane structure Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 26/28] drm/vc4: tests: Convert to plane creation helper Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 27/28] drm/rockchip: inno_hdmi: Switch to HDMI connector Maxime Ripard
2024-05-12 8:29 ` Andy Yan [this message]
2024-05-16 9:36 ` Maxime Ripard
2024-05-07 13:17 ` [PATCH v13 28/28] drm/sun4i: hdmi: " Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2d3073ce.16e2.18f6bec1d61.Coremail.andyshrk@163.com \
--to=andyshrk@163.com \
--cc=airlied@gmail.com \
--cc=andy.yan@rock-chips.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=hverkuil@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=samuel@sholland.org \
--cc=sebastian.wick@redhat.com \
--cc=tzimmermann@suse.de \
--cc=ville.syrjala@linux.intel.com \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).