Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Jouni Högander" <jouni.hogander@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t] tests/i915/kms_psr2_sf: Fix cleanup
Date: Thu, 23 Mar 2023 09:37:39 +0200	[thread overview]
Message-ID: <20230323073739.553919-1-jouni.hogander@intel.com> (raw)

Cleanup is leaving pipe reserved. This is causing failures like:

igt_kms-CRITICAL: DP-1 and eDP-1 are both trying to use pipe A

Fix by setting pipe of output as PIPE_NONE.

Cc: Jeevan B <jeevan.b@intel.com>

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 tests/i915/kms_psr2_sf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/i915/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
index 2d761d31..4a8608c1 100644
--- a/tests/i915/kms_psr2_sf.c
+++ b/tests/i915/kms_psr2_sf.c
@@ -846,10 +846,10 @@ static void cleanup(data_t *data)
 		igt_plane_set_fb(sprite, NULL);
 	}
 
-	if (data->coexist_feature & FEATURE_DSC) {
+	if (data->coexist_feature & FEATURE_DSC)
 		restore_force_dsc_en();
-		igt_output_set_pipe(output, PIPE_NONE);
-	}
+
+	igt_output_set_pipe(output, PIPE_NONE);
 
 	igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
-- 
2.34.1

             reply	other threads:[~2023-03-23  7:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-23  7:37 Jouni Högander [this message]
2023-03-23  7:43 ` [igt-dev] [PATCH i-g-t] tests/i915/kms_psr2_sf: Fix cleanup B, Jeevan
2023-03-23  7:46   ` Hogander, Jouni
2023-03-23  7:51     ` B, Jeevan
2023-03-23  8:29 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2023-03-23 10:17 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2023-03-27  7:02   ` Hogander, Jouni

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=20230323073739.553919-1-jouni.hogander@intel.com \
    --to=jouni.hogander@intel.com \
    --cc=igt-dev@lists.freedesktop.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