From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E58D01F5839; Wed, 19 Feb 2025 08:46:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739954783; cv=none; b=rM2PHyWqd/9PjFBis3FURDDi1VSQ1xb1LXQ6HPs13ntGlRhyJ7vI1+0yyhUgZF3IyKk4tHASPwaNvmoxpYrMyHKKa0mvVeLldfGsJj2/TuchsuOzbcCoDj6ajkD4if1eU4cWGR2OyyjN5eRMv4en/syPFRfGhyGj0i3kQDI9QA4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739954783; c=relaxed/simple; bh=cyK/Fk+0FuCljp1Jxgk0OL/ugx9tQOkbuGsbVYgDlZI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FaMY7HAzaCYsliItdjTHc1jVtCy1+PBOD44ZJG5mOgIspyRK8VXhJD2MWuDKfbUqVCfv4CnMqwAiqjkXxWdiCV/jWQW2gm23r+D8k84XdDQXFYfzEm9I8Gq7snF9hRa7c6yEIf60MXu30cHLJost6o8WKqbizzSCopF51aeahh8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JUbX4uOM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JUbX4uOM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63EB1C4CED1; Wed, 19 Feb 2025 08:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739954782; bh=cyK/Fk+0FuCljp1Jxgk0OL/ugx9tQOkbuGsbVYgDlZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JUbX4uOM8di7ABmAevrTNQkTIugcnHOEi8k7aNd4Hjf0ZNSOi5Oa+jBTe4GSnFm3L LxD+VDf76YrI8EluxU/aggcTcaDjdqC0g9T9oGaKDjlUReQkj3w1yEc6wbl/bSym0J B8WeVYsbIAk2P9r02PLlcOTd4LkTf9kvA8yILwGc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dave Airlie , Simona Vetter , Maxime Ripard , Sasha Levin Subject: [PATCH 6.12 035/230] drm/tests: hdmi: Fix WW_MUTEX_SLOWPATH failures Date: Wed, 19 Feb 2025 09:25:52 +0100 Message-ID: <20250219082603.083868928@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082601.683263930@linuxfoundation.org> References: <20250219082601.683263930@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maxime Ripard [ Upstream commit fb97bc2e47f694f79d6358d981ae0428db8e8088 ] The light_up_connector helper function in the HDMI infrastructure unit tests uses drm_atomic_set_crtc_for_connector(), but fails when it returns an error. This function can return EDEADLK though if the sequence needs to be restarted, and WW_MUTEX_SLOWPATH is meant to test that we handle it properly. Let's handle EDEADLK and restart the sequence in our tests as well. Fixes: eb66d34d793e ("drm/tests: Add output bpc tests") Reported-by: Dave Airlie Closes: https://lore.kernel.org/r/CAPM=9tzJ4-ERDxvuwrCyUPY0=+P44orhp1kLWVGL7MCfpQjMEQ@mail.gmail.com/ Link: https://lore.kernel.org/r/20241031091558.2435850-1-mripard@kernel.org Reviewed-by: Simona Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20250129-test-kunit-v2-1-fe59c43805d5@kernel.org Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 7 +++++++ 1 file changed, 7 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 4ba869e0e794c..cbd9584af3299 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -70,10 +70,17 @@ static int light_up_connector(struct kunit *test, state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); +retry: conn_state = drm_atomic_get_connector_state(state, connector); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); ret = drm_atomic_set_crtc_for_connector(conn_state, crtc); + if (ret == -EDEADLK) { + drm_atomic_state_clear(state); + ret = drm_modeset_backoff(ctx); + if (!ret) + goto retry; + } KUNIT_EXPECT_EQ(test, ret, 0); crtc_state = drm_atomic_get_crtc_state(state, crtc); -- 2.39.5