From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2AE3210E462 for ; Thu, 23 Mar 2023 07:38:00 +0000 (UTC) From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: igt-dev@lists.freedesktop.org Date: Thu, 23 Mar 2023 09:37:39 +0200 Message-Id: <20230323073739.553919-1-jouni.hogander@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t] tests/i915/kms_psr2_sf: Fix cleanup List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: 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 Signed-off-by: Jouni Högander --- 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