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>,
"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>
Cc: "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,
"Maxime Ripard" <mripard@kernel.org>,
"Dave Stevenson" <dave.stevenson@raspberrypi.com>
Subject: [PATCH v12 14/28] drm/tests: Add HDMI connector rate filter hook tests
Date: Tue, 23 Apr 2024 12:45:43 +0200 [thread overview]
Message-ID: <20240423-kms-hdmi-connector-state-v12-14-3338e4c0b189@kernel.org> (raw)
In-Reply-To: <20240423-kms-hdmi-connector-state-v12-0-3338e4c0b189@kernel.org>
The previous patch adds a new hook for HDMI connectors to filter out
configurations based on the TMDS character rate. Let's add some tests to
make sure it works as expected.
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 65 ++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
index 7f9a48902db4..ead998a691e7 100644
--- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
@@ -113,10 +113,22 @@ static int set_connector_edid(struct kunit *test, struct drm_connector *connecto
}
static const struct drm_connector_hdmi_funcs dummy_connector_hdmi_funcs = {
};
+static enum drm_mode_status
+reject_connector_tmds_char_rate_valid(const struct drm_connector *connector,
+ const struct drm_display_mode *mode,
+ unsigned long long tmds_rate)
+{
+ return MODE_BAD;
+}
+
+static const struct drm_connector_hdmi_funcs reject_connector_hdmi_funcs = {
+ .tmds_char_rate_valid = reject_connector_tmds_char_rate_valid,
+};
+
static int dummy_connector_get_modes(struct drm_connector *connector)
{
struct drm_atomic_helper_connector_hdmi_priv *priv =
connector_to_priv(connector);
const struct drm_edid *edid;
@@ -491,11 +503,64 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test)
KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_bpc, 12);
KUNIT_ASSERT_EQ(test, conn_state->hdmi.output_format, HDMI_COLORSPACE_RGB);
KUNIT_EXPECT_EQ(test, conn_state->hdmi.tmds_char_rate, preferred->clock * 1500);
}
+/*
+ * Test that if we filter a rate through our hook, it's indeed rejected
+ * by the whole atomic_check logic.
+ *
+ * We do so by first doing a commit on the pipeline to make sure that it
+ * works, change the HDMI helpers pointer, and then try the same commit
+ * again to see if it fails as it should.
+ */
+static void drm_test_check_hdmi_funcs_reject_rate(struct kunit *test)
+{
+ struct drm_atomic_helper_connector_hdmi_priv *priv;
+ struct drm_modeset_acquire_ctx *ctx;
+ struct drm_atomic_state *state;
+ struct drm_display_mode *preferred;
+ struct drm_crtc_state *crtc_state;
+ struct drm_connector *conn;
+ struct drm_device *drm;
+ struct drm_crtc *crtc;
+ int ret;
+
+ priv = drm_atomic_helper_connector_hdmi_init(test,
+ BIT(HDMI_COLORSPACE_RGB),
+ 8);
+ KUNIT_ASSERT_NOT_NULL(test, priv);
+
+ ctx = drm_kunit_helper_acquire_ctx_alloc(test);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
+
+ conn = &priv->connector;
+ preferred = find_preferred_mode(conn);
+ KUNIT_ASSERT_NOT_NULL(test, preferred);
+
+ drm = &priv->drm;
+ crtc = priv->crtc;
+ ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
+ KUNIT_ASSERT_EQ(test, ret, 0);
+
+ /* You shouldn't be doing that at home. */
+ conn->hdmi.funcs = &reject_connector_hdmi_funcs;
+
+ state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
+
+ crtc_state = drm_atomic_get_crtc_state(state, crtc);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state);
+
+ crtc_state->connectors_changed = true;
+
+ ret = drm_atomic_check_only(state);
+ KUNIT_EXPECT_LT(test, ret, 0);
+}
+
static struct kunit_case drm_atomic_helper_connector_hdmi_check_tests[] = {
+ KUNIT_CASE(drm_test_check_hdmi_funcs_reject_rate),
KUNIT_CASE(drm_test_check_output_bpc_crtc_mode_changed),
KUNIT_CASE(drm_test_check_output_bpc_crtc_mode_not_changed),
KUNIT_CASE(drm_test_check_tmds_char_rate_rgb_8bpc),
KUNIT_CASE(drm_test_check_tmds_char_rate_rgb_10bpc),
KUNIT_CASE(drm_test_check_tmds_char_rate_rgb_12bpc),
--
2.44.0
next prev parent reply other threads:[~2024-04-23 10:46 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 10:45 [PATCH v12 00/28] drm/connector: Create HDMI Connector infrastructure Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 01/28] drm/connector: Introduce an HDMI connector initialization function Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 02/28] drm/mode_object: Export drm_mode_obj_find_prop_id for tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 03/28] drm/tests: connector: Add tests for drmm_connector_hdmi_init Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 04/28] drm/connector: hdmi: Create an HDMI sub-state Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 05/28] drm/connector: hdmi: Add output BPC to the connector state Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 06/28] drm/tests: Add output bpc tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 07/28] drm/connector: hdmi: Add support for output format Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 08/28] drm/tests: Add output formats tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 09/28] drm/display: hdmi: Add HDMI compute clock helper Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 10/28] drm/tests: Add HDMI TDMS character rate tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 11/28] drm/connector: hdmi: Calculate TMDS character rate Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 12/28] drm/tests: Add TDMS character rate connector state tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 13/28] drm/connector: hdmi: Add custom hook to filter TMDS character rate Maxime Ripard
2024-04-23 10:45 ` Maxime Ripard [this message]
2024-04-23 10:45 ` [PATCH v12 15/28] drm/connector: hdmi: Compute bpc and format automatically Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 16/28] drm/tests: Add HDMI connector bpc and format tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 17/28] drm/connector: hdmi: Add Broadcast RGB property Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 18/28] drm/tests: Add tests for " Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 19/28] drm/connector: hdmi: Add RGB Quantization Range to the connector state Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 20/28] drm/tests: Add RGB Quantization tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 21/28] drm/connector: hdmi: Add Infoframes generation Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 22/28] drm/tests: Add infoframes test Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 23/28] drm/connector: hdmi: Create Infoframe DebugFS entries Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 24/28] drm/vc4: hdmi: Switch to HDMI connector Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 25/28] drm/vc4: tests: Remove vc4_dummy_plane structure Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 26/28] drm/vc4: tests: Convert to plane creation helper Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 27/28] drm/rockchip: inno_hdmi: Switch to HDMI connector Maxime Ripard
2024-04-27 10:12 ` Andy Yan
2024-05-06 7:49 ` Maxime Ripard
2024-04-27 10:44 ` Andy Yan
2024-05-06 7:59 ` Maxime Ripard
2024-05-06 8:22 ` Andy Yan
2024-05-07 1:32 ` Andy Yan
2024-04-23 10:45 ` [PATCH v12 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=20240423-kms-hdmi-connector-state-v12-14-3338e4c0b189@kernel.org \
--to=mripard@kernel.org \
--cc=airlied@gmail.com \
--cc=andy.yan@rock-chips.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dave.stevenson@raspberrypi.com \
--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=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).