From nobody Mon Feb 9 17:56:47 2026 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 0BCB51DE4E5 for ; Wed, 29 Jan 2025 14:22:16 +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=1738160538; cv=none; b=L9U9AGgpd6cEtWTnV718KQgdTQP3UagWEL/sIco7WY4mUQpu+fjNeL6XLZjHPrcezXb0qLNtr+Qvij7C73jIy3r3l1Dt6ss7ecSQojrP55EnoNumvgmrwLQtOUdylkR3KXYeOBQ6WmCBu4etBgIxG7SYVt7+vMO7ZeD5sYCehW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738160538; c=relaxed/simple; bh=EhZYWNER23QUBxjobvk8JDtMawsPWxjBAGFhERxSkn4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=j09MxKzHt4ekKTAS12Ue7dd5Fs84idLzoDdxrFYMCv8V6a1/srkMp9BrhRMQNlNYb+kauoUISBAHCdOvSUNSwGf7naEi71+oOoUyWiQGKNvossyTP6eT749ALq81UE3v5Fw4EyWiqv2M18bXniqNC6kacG8y5GBrLgAWOAMG47c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FhsWwlVe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FhsWwlVe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E0AAC4CED1; Wed, 29 Jan 2025 14:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738160536; bh=EhZYWNER23QUBxjobvk8JDtMawsPWxjBAGFhERxSkn4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=FhsWwlVe5A/hk5pqHJDS4sferUKUeF21+5srLpiGs8jCVs69k3y8VuFH0q7cOJeCV yqKQBumrOe3hnzXCdPK+ViWeNQUBVG3P/vXZoWXSuLvkOoNGig9GwWyAK6NPNlArL4 X3JiUhblVPaqf3J6/jwtDVSXLl4afPHYuarAHX5evcp4fG6LFpu3N3NBvVahvRvKbf y2p/fL2HAzyT7PzMiW7UufBnAygVHHRxtj4jiZHrNXZNfXdfKNnobc89wPInWxLV+q zzshHRULcQKuoQjOqNl7f0FUvSRLfu7JB4Y2bMbusEe7pZkFPmNef3mofgVnxMdWE/ /9DYBzpkv+AsQ== From: Maxime Ripard Date: Wed, 29 Jan 2025 15:21:56 +0100 Subject: [PATCH v2 4/4] drm/tests: hdmi: Fix recursive locking Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250129-test-kunit-v2-4-fe59c43805d5@kernel.org> References: <20250129-test-kunit-v2-0-fe59c43805d5@kernel.org> In-Reply-To: <20250129-test-kunit-v2-0-fe59c43805d5@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=17211; i=mripard@kernel.org; h=from:subject:message-id; bh=EhZYWNER23QUBxjobvk8JDtMawsPWxjBAGFhERxSkn4=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOmzLDuspKakTfzbuGXbZ+MFavERx9IPSU0vf3/jpcqLw 1MkE1cldExlYRDmZJAVU2R5IhN2enn74ioH+5U/YOawMoEMYeDiFICJdEkx1sp/KNu7eOpphddH 3t+UEPhx9+OsG66T5E9qfNgrN3FCMFuhwubrbys183nmPM46V3nSfQtjwwc/rWOLEjf+N59X9JB V+VMRh/VKn4j5+u3nZGV7o55nqhSEXTG+9Z1n+6Fks/x1LrM6AA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The find_preferred_mode() functions takes the mode_config mutex, but due to the order most tests have, is called with the crtc_ww_class_mutex taken. This raises a warning for a circular dependency when running the tests with lockdep. Reorder the tests to call find_preferred_mode before the acquire context has been created to avoid the issue. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 114 ++++++++++-------= ---- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/g= pu/drm/tests/drm_hdmi_state_helper_test.c index c265d28631603f266ba606564e77b8f965b7f83b..037c19875daf8b9b13e7702c864= 0dde1547f817c 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -291,16 +291,16 @@ static void drm_test_check_broadcast_rgb_crtc_mode_ch= anged(struct kunit *test) =20 drm =3D &priv->drm; crtc =3D priv->crtc; conn =3D &priv->connector; =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); @@ -355,16 +355,16 @@ static void drm_test_check_broadcast_rgb_crtc_mode_no= t_changed(struct kunit *tes =20 drm =3D &priv->drm; crtc =3D priv->crtc; conn =3D &priv->connector; =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); @@ -420,17 +420,17 @@ static void drm_test_check_broadcast_rgb_auto_cea_mod= e(struct kunit *test) drm =3D &priv->drm; crtc =3D priv->crtc; conn =3D &priv->connector; KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); @@ -531,17 +531,17 @@ static void drm_test_check_broadcast_rgb_full_cea_mod= e(struct kunit *test) drm =3D &priv->drm; crtc =3D priv->crtc; conn =3D &priv->connector; KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); @@ -646,17 +646,17 @@ static void drm_test_check_broadcast_rgb_limited_cea_= mode(struct kunit *test) drm =3D &priv->drm; crtc =3D priv->crtc; conn =3D &priv->connector; KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); @@ -766,16 +766,16 @@ static void drm_test_check_output_bpc_crtc_mode_chang= ed(struct kunit *test) ret =3D set_connector_edid(test, conn, test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz, ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz)); KUNIT_ASSERT_GT(test, ret, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); @@ -840,16 +840,16 @@ static void drm_test_check_output_bpc_crtc_mode_not_c= hanged(struct kunit *test) ret =3D set_connector_edid(test, conn, test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz, ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz)); KUNIT_ASSERT_GT(test, ret, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 state =3D drm_kunit_helper_atomic_state_alloc(test, drm, ctx); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); @@ -914,16 +914,16 @@ static void drm_test_check_output_bpc_dvi(struct kuni= t *test) KUNIT_ASSERT_GT(test, ret, 0); =20 info =3D &conn->display_info; KUNIT_ASSERT_FALSE(test, info->is_hdmi); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); @@ -958,17 +958,17 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(st= ruct kunit *test) ret =3D set_connector_edid(test, conn, test_edid_hdmi_1080p_rgb_max_200mhz, ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_200mhz)); KUNIT_ASSERT_GT(test, ret, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); @@ -1005,17 +1005,17 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc= (struct kunit *test) ret =3D set_connector_edid(test, conn, test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz, ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz)); KUNIT_ASSERT_GT(test, ret, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); @@ -1052,17 +1052,17 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc= (struct kunit *test) ret =3D set_connector_edid(test, conn, test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz, ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz)); KUNIT_ASSERT_GT(test, ret, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); @@ -1099,16 +1099,16 @@ static void drm_test_check_hdmi_funcs_reject_rate(s= truct kunit *test) =20 drm =3D &priv->drm; crtc =3D priv->crtc; conn =3D &priv->connector; =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_ASSERT_EQ(test, ret, 0); =20 /* You shouldn't be doing that at home. */ conn->hdmi.funcs =3D &reject_connector_hdmi_funcs; @@ -1164,23 +1164,23 @@ static void drm_test_check_max_tmds_rate_bpc_fallba= ck(struct kunit *test) =20 info =3D &conn->display_info; KUNIT_ASSERT_TRUE(test, info->is_hdmi); KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000); =20 rate =3D drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); @@ -1233,13 +1233,10 @@ static void drm_test_check_max_tmds_rate_format_fal= lback(struct kunit *test) =20 info =3D &conn->display_info; KUNIT_ASSERT_TRUE(test, info->is_hdmi); KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 rate =3D drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB); @@ -1249,10 +1246,13 @@ static void drm_test_check_max_tmds_rate_format_fal= lback(struct kunit *test) KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000); =20 rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV42= 2); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); @@ -1295,13 +1295,10 @@ static void drm_test_check_output_bpc_format_vic_1(= struct kunit *test) =20 info =3D &conn->display_info; KUNIT_ASSERT_TRUE(test, info->is_hdmi); KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - mode =3D drm_kunit_display_mode_from_cea_vic(test, drm, 1); KUNIT_ASSERT_NOT_NULL(test, mode); =20 /* * NOTE: We can't use drm_hdmi_compute_mode_clock() @@ -1311,10 +1308,13 @@ static void drm_test_check_output_bpc_format_vic_1(= struct kunit *test) * Thus, we have to calculate the rate by hand. */ rate =3D mode->clock * 1500; KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + crtc =3D priv->crtc; ret =3D light_up_connector(test, drm, crtc, conn, mode, ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; @@ -1356,13 +1356,10 @@ static void drm_test_check_output_bpc_format_driver= _rgb_only(struct kunit *test) =20 info =3D &conn->display_info; KUNIT_ASSERT_TRUE(test, info->is_hdmi); KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 /* * We're making sure that YUV422 would be the preferred option @@ -1377,10 +1374,13 @@ static void drm_test_check_output_bpc_format_driver= _rgb_only(struct kunit *test) KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000); =20 rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV42= 2); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); @@ -1423,13 +1423,10 @@ static void drm_test_check_output_bpc_format_displa= y_rgb_only(struct kunit *test =20 info =3D &conn->display_info; KUNIT_ASSERT_TRUE(test, info->is_hdmi); KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 /* * We're making sure that YUV422 would be the preferred option @@ -1444,10 +1441,13 @@ static void drm_test_check_output_bpc_format_displa= y_rgb_only(struct kunit *test KUNIT_ASSERT_GT(test, rate, info->max_tmds_clock * 1000); =20 rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV42= 2); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); @@ -1489,23 +1489,23 @@ static void drm_test_check_output_bpc_format_driver= _8bpc_only(struct kunit *test =20 info =3D &conn->display_info; KUNIT_ASSERT_TRUE(test, info->is_hdmi); KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 /* * We're making sure that we have headroom on the TMDS character * clock to actually use 12bpc. */ rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); @@ -1549,23 +1549,23 @@ static void drm_test_check_output_bpc_format_displa= y_8bpc_only(struct kunit *tes =20 info =3D &conn->display_info; KUNIT_ASSERT_TRUE(test, info->is_hdmi); KUNIT_ASSERT_GT(test, info->max_tmds_clock, 0); =20 - ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); - preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 /* * We're making sure that we have headroom on the TMDS character * clock to actually use 12bpc. */ rate =3D drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB); KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); =20 + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); + ret =3D light_up_connector(test, drm, crtc, conn, preferred, ctx); KUNIT_EXPECT_EQ(test, ret, 0); =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); --=20 2.47.1