From: Maxime Ripard <mripard@kernel.org>
To: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Emma Anholt" <emma@anholt.net>,
"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>
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
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 <mripard@kernel.org>
Subject: [PATCH RFC v2 32/37] drm/rockchip: inno_hdmi: Switch to HDMI connector
Date: Wed, 20 Sep 2023 16:35:47 +0200 [thread overview]
Message-ID: <20230920-kms-hdmi-connector-state-v2-32-17932daddd7d@kernel.org> (raw)
In-Reply-To: <20230920-kms-hdmi-connector-state-v2-0-17932daddd7d@kernel.org>
The new HDMI connector infrastructure allows to remove some boilerplate,
especially to generate infoframes. Let's switch to it.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/rockchip/inno_hdmi.c | 101 ++++++++++++++---------------------
1 file changed, 41 insertions(+), 60 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index d0b463d166fb..d5661ef5e00b 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -223,9 +223,10 @@ static u32 inno_hdmi_get_frame_enable(struct inno_hdmi *hdmi,
return 0;
}
-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 inno_hdmi *hdmi = connector_to_inno_hdmi(connector);
u32 frame_index = inno_hdmi_get_frame_index(hdmi, type);
u32 disable = inno_hdmi_get_frame_disable(hdmi, type);
u32 mask = inno_hdmi_get_frame_mask(hdmi, type);
@@ -234,24 +235,23 @@ static void inno_hdmi_disable_frame(struct inno_hdmi *hdmi,
hdmi_modb(hdmi, HDMI_PACKET_SEND_AUTO, mask, disable);
hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_BUF_INDEX, frame_index);
+
+ return 0;
}
-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 inno_hdmi *hdmi = connector_to_inno_hdmi(connector);
u32 enable = inno_hdmi_get_frame_enable(hdmi, type);
u32 mask = inno_hdmi_get_frame_mask(hdmi, type);
u8 packed_frame[HDMI_MAXIMUM_INFO_FRAME_SIZE];
- ssize_t rc, i;
+ ssize_t i;
- inno_hdmi_disable_frame(hdmi, type);
+ inno_hdmi_disable_frame(connector, type);
- rc = hdmi_infoframe_pack(frame, packed_frame,
- sizeof(packed_frame));
- if (rc < 0)
- return rc;
-
- for (i = 0; i < rc; i++)
+ for (i = 0; i < len; i++)
hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_ADDR + i,
packed_frame[i]);
@@ -261,41 +261,10 @@ static int inno_hdmi_upload_frame(struct inno_hdmi *hdmi,
return 0;
}
-static int inno_hdmi_config_video_vsi(struct inno_hdmi *hdmi,
- struct drm_display_mode *mode)
-{
- union hdmi_infoframe frame;
- int rc;
-
- rc = drm_hdmi_vendor_infoframe_from_display_mode(&frame.vendor.hdmi,
- &hdmi->connector,
- mode);
- if (rc) {
- inno_hdmi_disable_frame(hdmi, HDMI_INFOFRAME_TYPE_VENDOR);
- return rc;
- }
-
- return inno_hdmi_upload_frame(hdmi, &frame, HDMI_INFOFRAME_TYPE_VENDOR);
-}
-
-static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi,
- struct drm_display_mode *mode)
-{
- union hdmi_infoframe frame;
- int rc;
-
- rc = 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;
- }
-
- frame.avi.colorspace = HDMI_COLORSPACE_RGB;
-
- return inno_hdmi_upload_frame(hdmi, &frame, HDMI_INFOFRAME_TYPE_AVI);
-}
+static const struct drm_connector_hdmi_funcs inno_hdmi_hdmi_connector_funcs = {
+ .clear_infoframe = inno_hdmi_disable_frame,
+ .write_infoframe = inno_hdmi_upload_frame,
+};
static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi)
{
@@ -374,9 +343,12 @@ static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi,
}
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;
+ 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,
@@ -390,10 +362,8 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi,
inno_hdmi_config_video_csc(hdmi);
- if (display->is_hdmi) {
- inno_hdmi_config_video_avi(hdmi, mode);
- inno_hdmi_config_video_vsi(hdmi, mode);
- }
+ drm_atomic_helper_connector_hdmi_update_infoframes(connector,
+ new_conn_state->state);
/*
* When IP controller have configured to an accurate video
@@ -401,7 +371,7 @@ 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, mode->clock * 1000);
+ 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,
@@ -425,7 +395,7 @@ static void inno_hdmi_encoder_enable(struct drm_encoder *encoder,
if (WARN_ON(!crtc_state))
return;
- inno_hdmi_setup(hdmi, &crtc_state->adjusted_mode);
+ inno_hdmi_setup(hdmi, crtc_state, conn_state);
inno_hdmi_set_pwr_mode(hdmi, NORMAL);
}
@@ -491,6 +461,12 @@ inno_hdmi_probe_single_connector_modes(struct drm_connector *connector,
return drm_helper_probe_single_connector_modes(connector, 1920, 1080);
}
+static void inno_hdmi_connector_reset(struct drm_connector *connector)
+{
+ drm_atomic_helper_connector_reset(connector);
+ __drm_atomic_helper_connector_hdmi_reset(connector, connector->state);
+}
+
static void inno_hdmi_connector_destroy(struct drm_connector *connector)
{
drm_connector_unregister(connector);
@@ -501,12 +477,13 @@ 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,
+ .reset = inno_hdmi_connector_reset,
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
};
static struct drm_connector_helper_funcs inno_hdmi_connector_helper_funcs = {
+ .atomic_check = drm_atomic_helper_connector_hdmi_check,
.get_modes = inno_hdmi_connector_get_modes,
};
@@ -533,10 +510,14 @@ static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi)
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);
drm_connector_attach_encoder(&hdmi->connector, encoder);
--
2.41.0
next prev parent reply other threads:[~2023-09-20 14:38 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 14:35 [PATCH RFC v2 00/37] drm/connector: Create HDMI Connector infrastructure Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 01/37] drm/connector: Introduce an HDMI connector Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 02/37] drm/connector: hdmi: Create a custom state Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 03/37] drm/connector: hdmi: Add Broadcast RGB property Maxime Ripard
2023-09-21 8:39 ` Pekka Paalanen
2023-09-20 14:35 ` [PATCH RFC v2 04/37] drm/connector: hdmi: Add helper to get the RGB range Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 05/37] drm/connector: hdmi: Add output BPC to the connector state Maxime Ripard
2023-09-21 8:48 ` Pekka Paalanen
2023-09-21 8:56 ` Jani Nikula
2023-09-20 14:35 ` [PATCH RFC v2 06/37] drm/connector: hdmi: Add support for output format Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 07/37] drm/connector: hdmi: Add HDMI compute clock helper Maxime Ripard
2023-09-20 17:15 ` Jernej Škrabec
2023-09-20 14:35 ` [PATCH RFC v2 08/37] drm/connector: hdmi: Calculate TMDS character rate Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 09/37] drm/connector: hdmi: Add custom hook to filter " Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 10/37] drm/connector: hdmi: Compute bpc and format automatically Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 11/37] drm/connector: hdmi: Add Infoframes generation Maxime Ripard
2023-09-20 17:11 ` Jernej Škrabec
2023-09-20 14:35 ` [PATCH RFC v2 12/37] drm/connector: hdmi: Create Infoframe DebugFS entries Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 13/37] drm/vc4: hdmi: Create destroy state implementation Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 14/37] drm/vc4: hdmi: Switch to HDMI connector Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 15/37] drm/rockchip: inno_hdmi: Remove useless mode_fixup Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 16/37] drm/rockchip: inno_hdmi: Remove useless copy of drm_display_mode Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 17/37] drm/rockchip: inno_hdmi: Switch encoder hooks to atomic Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 18/37] drm/rockchip: inno_hdmi: Get rid of mode_set Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 19/37] drm/rockchip: inno_hdmi: no need to store vic Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 20/37] drm/rockchip: inno_hdmi: Remove unneeded has audio flag Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 21/37] drm/rockchip: inno_hdmi: Remove useless input format Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 22/37] drm/rockchip: inno_hdmi: Remove useless output format Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 23/37] drm/rockchip: inno_hdmi: Remove useless colorimetry Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 24/37] drm/rockchip: inno_hdmi: Remove useless enum Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 25/37] drm/rockchip: inno_hdmi: Remove tmds rate from structure Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 26/37] drm/rockchip: inno_hdmi: Remove useless coeff_csc matrix Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 27/37] drm/rockchip: inno_hdmi: Remove useless mode_valid Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 28/37] drm/rockchip: inno_hdmi: Move infoframe disable to separate function Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 29/37] drm/rockchip: inno_hdmi: Create mask retrieval functions Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 30/37] drm/rockchip: inno_hdmi: Switch to infoframe type Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 31/37] drm/rockchip: inno_hdmi: Remove unused drm device pointer Maxime Ripard
2023-09-20 14:35 ` Maxime Ripard [this message]
2023-09-20 14:35 ` [PATCH RFC v2 33/37] drm/sun4i: hdmi: Convert encoder to atomic Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 34/37] drm/sun4i: hdmi: Move mode_set into enable Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 35/37] drm/sun4i: hdmi: Switch to container_of_const Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 36/37] drm/sun4i: hdmi: Consolidate atomic_check and mode_valid Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 37/37] drm/sun4i: hdmi: Switch to HDMI connector Maxime Ripard
2023-09-21 16:29 ` [PATCH RFC v2 00/37] drm/connector: Create HDMI Connector infrastructure Hans Verkuil
2023-09-21 16:48 ` 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=20230920-kms-hdmi-connector-state-v2-32-17932daddd7d@kernel.org \
--to=mripard@kernel.org \
--cc=airlied@gmail.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--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=samuel@sholland.org \
--cc=tzimmermann@suse.de \
--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
all inboxes | Powered by JetHome®