drm/tests: hdmi: Reorder DRM entities variables assignment

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.

Reviewed-by: Simona Vetter <simona.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20250129-test-kunit-v2-3-fe59c43805d5@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

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 a36422aa9e274e284d85b3c987a73cbe02851f49..925724b578789a12169e206e6770b1f8979db4cf 100644 (file)
--- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
@@ -289,15 +289,16 @@ static void drm_test_check_broadcast_rgb_crtc_mode_changed(struct kunit *test)
                                                    8);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
+       conn = &priv->connector;
+
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
 
-       conn = &priv->connector;
        preferred = find_preferred_mode(conn);
        KUNIT_ASSERT_NOT_NULL(test, preferred);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -352,15 +353,16 @@ static void drm_test_check_broadcast_rgb_crtc_mode_not_changed(struct kunit *tes
                                                    8);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
+       conn = &priv->connector;
+
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
 
-       conn = &priv->connector;
        preferred = find_preferred_mode(conn);
        KUNIT_ASSERT_NOT_NULL(test, preferred);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -415,6 +417,8 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode(struct kunit *test)
                                                    8);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi);
 
@@ -425,8 +429,6 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode(struct kunit *test)
        KUNIT_ASSERT_NOT_NULL(test, preferred);
        KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -526,6 +528,8 @@ static void drm_test_check_broadcast_rgb_full_cea_mode(struct kunit *test)
                                                    8);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi);
 
@@ -536,8 +540,6 @@ static void drm_test_check_broadcast_rgb_full_cea_mode(struct kunit *test)
        KUNIT_ASSERT_NOT_NULL(test, preferred);
        KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -641,6 +643,8 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode(struct kunit *test)
                                                    8);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi);
 
@@ -651,8 +655,6 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode(struct kunit *test)
        KUNIT_ASSERT_NOT_NULL(test, preferred);
        KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -758,6 +760,8 @@ static void drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test)
                                                    10);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
@@ -770,8 +774,6 @@ static void drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test)
        preferred = find_preferred_mode(conn);
        KUNIT_ASSERT_NOT_NULL(test, preferred);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -832,6 +834,8 @@ static void drm_test_check_output_bpc_crtc_mode_not_changed(struct kunit *test)
                                                    10);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
@@ -844,8 +848,6 @@ static void drm_test_check_output_bpc_crtc_mode_not_changed(struct kunit *test)
        preferred = find_preferred_mode(conn);
        KUNIT_ASSERT_NOT_NULL(test, preferred);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -903,6 +905,8 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test)
                                                    12);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_dvi_1080p,
@@ -918,8 +922,6 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test)
        preferred = find_preferred_mode(conn);
        KUNIT_ASSERT_NOT_NULL(test, preferred);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -950,6 +952,8 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct kunit *test)
                                                    8);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_max_200mhz,
@@ -963,8 +967,6 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct kunit *test)
        KUNIT_ASSERT_NOT_NULL(test, preferred);
        KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -997,6 +999,8 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc(struct kunit *test)
                                                    10);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz,
@@ -1010,8 +1014,6 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc(struct kunit *test)
        KUNIT_ASSERT_NOT_NULL(test, preferred);
        KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -1044,6 +1046,8 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test)
                                                    12);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz,
@@ -1057,8 +1061,6 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test)
        KUNIT_ASSERT_NOT_NULL(test, preferred);
        KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -1095,15 +1097,16 @@ static void drm_test_check_hdmi_funcs_reject_rate(struct kunit *test)
                                                    8);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
+       conn = &priv->connector;
+
        ctx = drm_kunit_helper_acquire_ctx_alloc(test);
        KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
 
-       conn = &priv->connector;
        preferred = find_preferred_mode(conn);
        KUNIT_ASSERT_NOT_NULL(test, preferred);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_ASSERT_EQ(test, ret, 0);
 
@@ -1151,6 +1154,8 @@ static void drm_test_check_max_tmds_rate_bpc_fallback(struct kunit *test)
                                                    12);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
@@ -1174,8 +1179,6 @@ static void drm_test_check_max_tmds_rate_bpc_fallback(struct kunit *test)
        rate = drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB);
        KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
@@ -1220,6 +1223,8 @@ static void drm_test_check_max_tmds_rate_format_fallback(struct kunit *test)
                                                    12);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
@@ -1246,8 +1251,6 @@ static void drm_test_check_max_tmds_rate_format_fallback(struct kunit *test)
        rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);
        KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
@@ -1343,6 +1346,8 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test)
                                                    12);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz,
@@ -1374,8 +1379,6 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test)
        rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);
        KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
@@ -1410,6 +1413,8 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test
                                                    12);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_max_200mhz,
@@ -1441,8 +1446,6 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test
        rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);
        KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
@@ -1476,6 +1479,8 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test
                                                    8);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz,
@@ -1499,8 +1504,6 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test
        rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
        KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);
 
@@ -1536,6 +1539,8 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes
                                                    12);
        KUNIT_ASSERT_NOT_NULL(test, priv);
 
+       drm = &priv->drm;
+       crtc = priv->crtc;
        conn = &priv->connector;
        ret = set_connector_edid(test, conn,
                                 test_edid_hdmi_1080p_rgb_max_340mhz,
@@ -1559,8 +1564,6 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes
        rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
        KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
 
-       drm = &priv->drm;
-       crtc = priv->crtc;
        ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
        KUNIT_EXPECT_EQ(test, ret, 0);