From nobody Mon Feb 9 17:56:46 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 0E24A195980 for ; Wed, 29 Jan 2025 14:22:13 +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=1738160534; cv=none; b=Fnv9K9a5yjFFYhMCB8/QRx843N0AYKaZuOs3uaetWv3PLQnVEBCpj0bhrcYDMfOmS36C2grhn+LSTf8C6eq2ORFnaXM2tzqzP2KyjXGkCZqHziE4uKqbi/GYsxLNydg5s+3nQFDreeHXTPrCugYpOnsbMcBcZB1J6uhy9AqCQ4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738160534; c=relaxed/simple; bh=ADo9G62kpcf40b2yx8be7dGFxjUQenFK2NhtIVR00Kc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gD5w/CDUVogDXKpcE70b2lFFwwUreZVeHBJUC7hDsGr3KjMxYqED5J4k8GwkpEFwmtrsi2vM+K7Cemg2a2d9mfXDLTcL6Sre92tk1VTQV/HfF8Dg4t0MW/36DCYb2JNpc7enr3k/ZQ/QzncYpd0xLS0kUHycvIMyC3tiAasLZCA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NE7pqaJM; 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="NE7pqaJM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16241C4CEE5; Wed, 29 Jan 2025 14:22:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738160533; bh=ADo9G62kpcf40b2yx8be7dGFxjUQenFK2NhtIVR00Kc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NE7pqaJMl7ndlRTcW/QDDNUlI3uuSLfU3Mv/LFW+Aw4Gmv88tPAzU7QLU8PvIprjG ZEyvX0wLGgdthgrLSAUu/4q3TeFcJZqkNk1wvxMl3+b83AR2cw8oE1al/yRcXIS4s3 8qTzVWoMWvfAVxc4eTVwXEB4jn3YdjTNjOVjU5TY+O4/Z6S558Jw9MJ9t/TQaA6rmB 6IGHxlvJqazuFR7C6QlV54LM8cPd6saCe8ug3/9kXvHV61q2XCGK3RpsiRHVbFEMIU FZ78cOPskN+OGdCyuTCm5S8ibmGW3QNAgdRin6Yrn/4wkQi41yzwN9aDZW0D/bFBc4 Cc4UoCcuBpVOQ== From: Maxime Ripard Date: Wed, 29 Jan 2025 15:21:55 +0100 Subject: [PATCH v2 3/4] drm/tests: hdmi: Reorder DRM entities variables assignment 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-3-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=17739; i=mripard@kernel.org; h=from:subject:message-id; bh=ADo9G62kpcf40b2yx8be7dGFxjUQenFK2NhtIVR00Kc=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOmzLNt36RYI8fieP1oi9vzYzrtsi1dfY78QcvTNMjMBa 1fj5ZvlOqayMAhzMsiKKbI8kQk7vbx9cZWD/cofMHNYmUCGMHBxCsBENBczNqyfOqX+9NGNSYUe pouXNTLp+G2VLpz5bcbHvZ57mZNfugRenfaJ8fruzUXLPSO27+wqkmKs0z+Ykrjo/P1MB8Gn2w9 Vmrg6FDTopVxtlJd6sj9nfcfRGxPur6k1r0tmX89kUiCr4/0PAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The tests all deviate slightly in how they assign their local pointers to DRM entities. This makes refactoring pretty difficult, so let's just move the assignment as soon as the entities are allocated. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 81 +++++++++++-------= ---- 1 file changed, 42 insertions(+), 39 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 32e0477deb45c1481a7d23bb6e6a74de52845d1c..c265d28631603f266ba606564e7= 7b8f965b7f83b 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -287,19 +287,20 @@ static void drm_test_check_broadcast_rgb_crtc_mode_ch= anged(struct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 8); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; + conn =3D &priv->connector; + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); =20 - conn =3D &priv->connector; preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -350,19 +351,20 @@ static void drm_test_check_broadcast_rgb_crtc_mode_no= t_changed(struct kunit *tes priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 8); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; + conn =3D &priv->connector; + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); =20 - conn =3D &priv->connector; preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -413,22 +415,22 @@ static void drm_test_check_broadcast_rgb_auto_cea_mod= e(struct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 8); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + 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); =20 preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -524,22 +526,22 @@ static void drm_test_check_broadcast_rgb_full_cea_mod= e(struct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 8); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + 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); =20 preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -639,22 +641,22 @@ static void drm_test_check_broadcast_rgb_limited_cea_= mode(struct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 8); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + 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); =20 preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -756,10 +758,12 @@ static void drm_test_check_output_bpc_crtc_mode_chang= ed(struct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 10); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -768,12 +772,10 @@ static void drm_test_check_output_bpc_crtc_mode_chang= ed(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); =20 preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -830,10 +832,12 @@ static void drm_test_check_output_bpc_crtc_mode_not_c= hanged(struct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 10); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -842,12 +846,10 @@ static void drm_test_check_output_bpc_crtc_mode_not_c= hanged(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); =20 preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -901,10 +903,12 @@ static void drm_test_check_output_bpc_dvi(struct kuni= t *test) BIT(HDMI_COLORSPACE_YUV422) | BIT(HDMI_COLORSPACE_YUV444), 12); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; ret =3D set_connector_edid(test, conn, test_edid_dvi_1080p, ARRAY_SIZE(test_edid_dvi_1080p)); KUNIT_ASSERT_GT(test, ret, 0); @@ -916,12 +920,10 @@ static void drm_test_check_output_bpc_dvi(struct kuni= t *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); =20 preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -948,10 +950,12 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(st= ruct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 8); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -961,12 +965,10 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(st= ruct kunit *test) =20 preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -995,10 +997,12 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc(s= truct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 10); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -1008,12 +1012,10 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc= (struct kunit *test) =20 preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -1042,10 +1044,12 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc= (struct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 12); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -1055,12 +1059,10 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc= (struct kunit *test) =20 preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -1093,19 +1095,20 @@ static void drm_test_check_hdmi_funcs_reject_rate(s= truct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 8); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; + conn =3D &priv->connector; + ctx =3D drm_kunit_helper_acquire_ctx_alloc(test); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); =20 - conn =3D &priv->connector; preferred =3D find_preferred_mode(conn); KUNIT_ASSERT_NOT_NULL(test, preferred); =20 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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; @@ -1149,10 +1152,12 @@ static void drm_test_check_max_tmds_rate_bpc_fallba= ck(struct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 12); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -1172,12 +1177,10 @@ static void drm_test_check_max_tmds_rate_bpc_fallba= ck(struct kunit *test) 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 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -1218,10 +1221,12 @@ static void drm_test_check_max_tmds_rate_format_fal= lback(struct kunit *test) BIT(HDMI_COLORSPACE_YUV422) | BIT(HDMI_COLORSPACE_YUV444), 12); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -1244,12 +1249,10 @@ 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 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -1341,10 +1344,12 @@ static void drm_test_check_output_bpc_format_driver= _rgb_only(struct kunit *test) priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 12); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -1372,12 +1377,10 @@ 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 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -1408,10 +1411,12 @@ static void drm_test_check_output_bpc_format_displa= y_rgb_only(struct kunit *test BIT(HDMI_COLORSPACE_YUV422) | BIT(HDMI_COLORSPACE_YUV444), 12); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -1439,12 +1444,10 @@ 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 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -1474,10 +1477,12 @@ static void drm_test_check_output_bpc_format_driver= _8bpc_only(struct kunit *test priv =3D drm_kunit_helper_connector_hdmi_init(test, BIT(HDMI_COLORSPACE_RGB), 8); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; 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); @@ -1497,12 +1502,10 @@ static void drm_test_check_output_bpc_format_driver= _8bpc_only(struct kunit *test * 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 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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); @@ -1534,10 +1537,12 @@ static void drm_test_check_output_bpc_format_displa= y_8bpc_only(struct kunit *tes BIT(HDMI_COLORSPACE_YUV422) | BIT(HDMI_COLORSPACE_YUV444), 12); KUNIT_ASSERT_NOT_NULL(test, priv); =20 + drm =3D &priv->drm; + crtc =3D priv->crtc; conn =3D &priv->connector; ret =3D set_connector_edid(test, conn, test_edid_hdmi_1080p_rgb_max_340mhz, ARRAY_SIZE(test_edid_hdmi_1080p_rgb_max_340mhz)); KUNIT_ASSERT_GT(test, ret, 0); @@ -1557,12 +1562,10 @@ static void drm_test_check_output_bpc_format_displa= y_8bpc_only(struct kunit *tes * 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 - drm =3D &priv->drm; - crtc =3D priv->crtc; 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