From: mpenttil@redhat.com
To: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org,
"Mika Penttilä" <mpenttil@redhat.com>,
"Maxime Ripard" <mripard@kernel.org>
Subject: [PATCH] drm/tests: hdmi: fix infoframes tests
Date: Mon, 14 Sep 2026 07:07:23 +0300 [thread overview]
Message-ID: <20260914040723.2593700-1-mpenttil@redhat.com> (raw)
From: Mika Penttilä <mpenttil@redhat.com>
drm_atomic_commit() calls drm_atomic_check_only() internally. Calling
drm_atomic_check_only() explicitly before the commit leaves the state
marked as checked and triggers drm_WARN_ON(state->checked) when the
commit checks the state again.
Remove the redundant explicit checks.
Fixes: 7436a87db99d ("drm/tests: hdmi: check the infoframes behaviour")
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Mika Penttilä <mpenttil@redhat.com>
---
.../drm/tests/drm_hdmi_state_helper_test.c | 54 -------------------
1 file changed, 54 deletions(-)
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 353a261d42da..f8ae1a0bd5c0 100644
--- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
@@ -2929,15 +2929,6 @@ static void drm_test_check_infoframes(struct kunit *test)
old_hdmi_update_failures = priv->hdmi_update_failures;
- ret = drm_atomic_check_only(state);
- if (ret == -EDEADLK) {
- drm_atomic_commit_clear(state);
- ret = drm_modeset_backoff(&ctx);
- if (!ret)
- goto retry_crtc_state;
- }
- KUNIT_ASSERT_EQ(test, ret, 0);
-
ret = drm_atomic_commit(state);
if (ret == -EDEADLK) {
drm_atomic_commit_clear(state);
@@ -3034,15 +3025,6 @@ static void drm_test_check_reject_avi_infoframe(struct kunit *test)
old_hdmi_update_failures = priv->hdmi_update_failures;
- ret = drm_atomic_check_only(state);
- if (ret == -EDEADLK) {
- drm_atomic_commit_clear(state);
- ret = drm_modeset_backoff(&ctx);
- if (!ret)
- goto retry_crtc_state;
- }
- KUNIT_ASSERT_EQ(test, ret, 0);
-
ret = drm_atomic_commit(state);
if (ret == -EDEADLK) {
drm_atomic_commit_clear(state);
@@ -3153,15 +3135,6 @@ static void drm_test_check_reject_hdr_infoframe_bpc_8(struct kunit *test)
old_hdmi_update_failures = priv->hdmi_update_failures;
- ret = drm_atomic_check_only(state);
- if (ret == -EDEADLK) {
- drm_atomic_commit_clear(state);
- ret = drm_modeset_backoff(&ctx);
- if (!ret)
- goto retry_conn_state;
- }
- KUNIT_ASSERT_EQ(test, ret, 0);
-
ret = drm_atomic_commit(state);
if (ret == -EDEADLK) {
drm_atomic_commit_clear(state);
@@ -3276,15 +3249,6 @@ static void drm_test_check_reject_hdr_infoframe_bpc_10(struct kunit *test)
old_hdmi_update_failures = priv->hdmi_update_failures;
- ret = drm_atomic_check_only(state);
- if (ret == -EDEADLK) {
- drm_atomic_commit_clear(state);
- ret = drm_modeset_backoff(&ctx);
- if (!ret)
- goto retry_conn_state;
- }
- KUNIT_ASSERT_EQ(test, ret, 0);
-
ret = drm_atomic_commit(state);
if (ret == -EDEADLK) {
drm_atomic_commit_clear(state);
@@ -3387,15 +3351,6 @@ static void drm_test_check_reject_audio_infoframe(struct kunit *test)
old_hdmi_update_failures = priv->hdmi_update_failures;
- ret = drm_atomic_check_only(state);
- if (ret == -EDEADLK) {
- drm_atomic_commit_clear(state);
- ret = drm_modeset_backoff(&ctx);
- if (!ret)
- goto retry_crtc_state;
- }
- KUNIT_ASSERT_EQ(test, ret, 0);
-
ret = drm_atomic_commit(state);
if (ret == -EDEADLK) {
drm_atomic_commit_clear(state);
@@ -3438,15 +3393,6 @@ static void drm_test_check_reject_audio_infoframe(struct kunit *test)
old_hdmi_update_failures = priv->hdmi_update_failures;
- ret = drm_atomic_check_only(state);
- if (ret == -EDEADLK) {
- drm_atomic_commit_clear(state);
- ret = drm_modeset_backoff(&ctx);
- if (!ret)
- goto retry_crtc_state_2;
- }
- KUNIT_ASSERT_EQ(test, ret, 0);
-
ret = drm_atomic_commit(state);
if (ret == -EDEADLK) {
drm_atomic_commit_clear(state);
--
2.55.0
next reply other threads:[~2026-09-14 4:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-14 4:07 mpenttil [this message]
2026-09-15 14:14 ` 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=20260914040723.2593700-1-mpenttil@redhat.com \
--to=mpenttil@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mripard@kernel.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®