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>,
Dave Stevenson <dave.stevenson@raspberrypi.com>
Subject: [PATCH v6 19/36] drm/connector: hdmi: Calculate TMDS character rate
Date: Mon, 12 Feb 2024 14:13:02 +0100 [thread overview]
Message-ID: <20240212-kms-hdmi-connector-state-v6-19-f4bcdc979e6f@kernel.org> (raw)
In-Reply-To: <20240212-kms-hdmi-connector-state-v6-0-f4bcdc979e6f@kernel.org>
Most HDMI drivers have some code to calculate the TMDS character rate,
usually to adjust an internal clock to match what the mode requires.
Since the TMDS character rates mostly depends on the resolution, whether
we need to repeat pixels or not, the bpc count and the format, we can
now derive it from the HDMI connector state that stores all those infos
and remove the duplication from drivers.
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/drm_atomic.c | 1 +
drivers/gpu/drm/drm_atomic_state_helper.c | 44 ++++++++++++++++++++++
.../gpu/drm/tests/drm_atomic_state_helper_test.c | 3 ++
include/drm/drm_connector.h | 5 +++
4 files changed, 53 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 47fd2a7ca9e1..ec6c6beda5c9 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1151,6 +1151,7 @@ static void drm_atomic_connector_print_state(struct drm_printer *p,
drm_printf(p, "\toutput_bpc=%u\n", state->hdmi.output_bpc);
drm_printf(p, "\toutput_format=%s\n",
drm_hdmi_connector_get_output_format_name(state->hdmi.output_format));
+ drm_printf(p, "\ttmds_char_rate=%llu\n", state->hdmi.tmds_char_rate);
}
if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c
index 34aee5232974..ac77d47a0ce3 100644
--- a/drivers/gpu/drm/drm_atomic_state_helper.c
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c
@@ -683,6 +683,41 @@ static bool hdmi_is_full_range(const struct drm_connector *connector,
return drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_FULL ? true : false;
}
+static enum drm_mode_status
+hdmi_clock_valid(const struct drm_connector *connector,
+ const struct drm_display_mode *mode,
+ unsigned long long clock)
+{
+ const struct drm_display_info *info = &connector->display_info;
+
+ if (info->max_tmds_clock && clock > info->max_tmds_clock * 1000)
+ return MODE_CLOCK_HIGH;
+
+ return MODE_OK;
+}
+
+static int
+hdmi_compute_clock(const struct drm_connector *connector,
+ struct drm_connector_state *state,
+ const struct drm_display_mode *mode,
+ unsigned int bpc, enum hdmi_colorspace fmt)
+{
+ enum drm_mode_status status;
+ unsigned long long clock;
+
+ clock = drm_connector_hdmi_compute_mode_clock(mode, bpc, fmt);
+ if (!clock)
+ return -EINVAL;
+
+ status = hdmi_clock_valid(connector, mode, clock);
+ if (status != MODE_OK)
+ return -EINVAL;
+
+ state->hdmi.tmds_char_rate = clock;
+
+ return 0;
+}
+
/**
* drm_atomic_helper_connector_hdmi_check() - Helper to check HDMI connector atomic state
* @connector: DRM Connector
@@ -702,9 +737,18 @@ int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector,
drm_atomic_get_old_connector_state(state, connector);
struct drm_connector_state *new_state =
drm_atomic_get_new_connector_state(state, connector);
+ const struct drm_display_mode *mode =
+ connector_state_get_mode(new_state);
+ int ret;
new_state->hdmi.is_full_range = hdmi_is_full_range(connector, new_state);
+ ret = hdmi_compute_clock(connector, new_state, mode,
+ new_state->hdmi.output_bpc,
+ new_state->hdmi.output_format);
+ if (ret)
+ return ret;
+
if (old_state->hdmi.broadcast_rgb != new_state->hdmi.broadcast_rgb ||
old_state->hdmi.output_bpc != new_state->hdmi.output_bpc ||
old_state->hdmi.output_format != new_state->hdmi.output_format) {
diff --git a/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c b/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c
index 4e2ec436987b..d3f35600a9f9 100644
--- a/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c
@@ -70,6 +70,9 @@ static int light_up_connector(struct kunit *test,
conn_state = drm_atomic_get_connector_state(state, connector);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);
+ conn_state->hdmi.output_bpc = connector->max_bpc;
+ conn_state->hdmi.output_format = HDMI_COLORSPACE_RGB;
+
ret = drm_atomic_set_crtc_for_connector(conn_state, crtc);
KUNIT_EXPECT_EQ(test, ret, 0);
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 0cc5a8732664..59016d9c17f5 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1085,6 +1085,11 @@ struct drm_connector_state {
* @output_format: Pixel format to output in.
*/
enum hdmi_colorspace output_format;
+
+ /**
+ * @tmds_char_rate: TMDS Character Rate, in Hz.
+ */
+ unsigned long long tmds_char_rate;
} hdmi;
};
--
2.43.0
next prev parent reply other threads:[~2024-02-12 13:14 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-12 13:12 [PATCH v6 00/36] drm/connector: Create HDMI Connector infrastructure Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 01/36] drm/tests: helpers: Include missing drm_drv header Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 02/36] drm/tests: helpers: Add atomic helpers Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 03/36] drm/tests: Add helper to create mock plane Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 04/36] drm/tests: Add helper to create mock crtc Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 05/36] drm/tests: connector: Add tests for drmm_connector_init Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 06/36] drm/connector: Introduce an HDMI connector initialization function Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 07/36] drm/tests: connector: Add tests for drmm_connector_hdmi_init Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 08/36] drm/connector: hdmi: Create an HDMI sub-state Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 09/36] drm/connector: hdmi: Add Broadcast RGB property Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 10/36] drm/tests: Add tests for " Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 11/36] drm/connector: hdmi: Add RGB Quantization Range to the connector state Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 12/36] drm/tests: Add RGB Quantization tests Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 13/36] drm/connector: hdmi: Add output BPC to the connector state Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 14/36] drm/tests: Add output bpc tests Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 15/36] drm/connector: hdmi: Add support for output format Maxime Ripard
2024-02-12 13:12 ` [PATCH v6 16/36] drm/tests: Add output formats tests Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 17/36] drm/connector: hdmi: Add HDMI compute clock helper Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 18/36] drm/tests: Add HDMI TDMS character rate tests Maxime Ripard
2024-02-12 13:13 ` Maxime Ripard [this message]
2024-02-12 13:13 ` [PATCH v6 20/36] drm/tests: Add TDMS character rate connector state tests Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 21/36] drm/connector: hdmi: Add custom hook to filter TMDS character rate Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 22/36] drm/tests: Add HDMI connector rate filter hook tests Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 23/36] drm/connector: hdmi: Compute bpc and format automatically Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 24/36] drm/tests: Add HDMI connector bpc and format tests Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 25/36] drm/connector: hdmi: Add Infoframes generation Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 26/36] drm/tests: Add infoframes test Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 27/36] drm/connector: hdmi: Create Infoframe DebugFS entries Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 28/36] drm/vc4: hdmi: Switch to HDMI connector Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 29/36] drm/vc4: tests: Remove vc4_dummy_plane structure Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 30/36] drm/vc4: tests: Convert to plane creation helper Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 31/36] drm/rockchip: inno_hdmi: Switch to HDMI connector Maxime Ripard
2024-02-13 19:01 ` Heiko Stuebner
2024-02-12 13:13 ` [PATCH v6 32/36] drm/sun4i: hdmi: Convert encoder to atomic Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 33/36] drm/sun4i: hdmi: Move mode_set into enable Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 34/36] drm/sun4i: hdmi: Switch to container_of_const Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 35/36] drm/sun4i: hdmi: Consolidate atomic_check and mode_valid Maxime Ripard
2024-02-12 13:13 ` [PATCH v6 36/36] drm/sun4i: hdmi: Switch to HDMI connector 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=20240212-kms-hdmi-connector-state-v6-19-f4bcdc979e6f@kernel.org \
--to=mripard@kernel.org \
--cc=airlied@gmail.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dave.stevenson@raspberrypi.com \
--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;
as well as URLs for NNTP newsgroup(s).