Skip to content

Commit 6b6bfd6

Browse files
mripardmripard
committed
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 <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
1 parent bb4f929 commit 6b6bfd6

File tree

1 file changed

+42
-39
lines changed

1 file changed

+42
-39
lines changed

‎drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -289,15 +289,16 @@ static void drm_test_check_broadcast_rgb_crtc_mode_changed(struct kunit *test)
289289
8);
290290
KUNIT_ASSERT_NOT_NULL(test, priv);
291291

292+
drm = &priv->drm;
293+
crtc = priv->crtc;
294+
conn = &priv->connector;
295+
292296
ctx = drm_kunit_helper_acquire_ctx_alloc(test);
293297
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
294298

295-
conn = &priv->connector;
296299
preferred = find_preferred_mode(conn);
297300
KUNIT_ASSERT_NOT_NULL(test, preferred);
298301

299-
drm = &priv->drm;
300-
crtc = priv->crtc;
301302
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
302303
KUNIT_ASSERT_EQ(test, ret, 0);
303304

@@ -352,15 +353,16 @@ static void drm_test_check_broadcast_rgb_crtc_mode_not_changed(struct kunit *tes
352353
8);
353354
KUNIT_ASSERT_NOT_NULL(test, priv);
354355

356+
drm = &priv->drm;
357+
crtc = priv->crtc;
358+
conn = &priv->connector;
359+
355360
ctx = drm_kunit_helper_acquire_ctx_alloc(test);
356361
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
357362

358-
conn = &priv->connector;
359363
preferred = find_preferred_mode(conn);
360364
KUNIT_ASSERT_NOT_NULL(test, preferred);
361365

362-
drm = &priv->drm;
363-
crtc = priv->crtc;
364366
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
365367
KUNIT_ASSERT_EQ(test, ret, 0);
366368

@@ -415,6 +417,8 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode(struct kunit *test)
415417
8);
416418
KUNIT_ASSERT_NOT_NULL(test, priv);
417419

420+
drm = &priv->drm;
421+
crtc = priv->crtc;
418422
conn = &priv->connector;
419423
KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi);
420424

@@ -425,8 +429,6 @@ static void drm_test_check_broadcast_rgb_auto_cea_mode(struct kunit *test)
425429
KUNIT_ASSERT_NOT_NULL(test, preferred);
426430
KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1);
427431

428-
drm = &priv->drm;
429-
crtc = priv->crtc;
430432
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
431433
KUNIT_ASSERT_EQ(test, ret, 0);
432434

@@ -526,6 +528,8 @@ static void drm_test_check_broadcast_rgb_full_cea_mode(struct kunit *test)
526528
8);
527529
KUNIT_ASSERT_NOT_NULL(test, priv);
528530

531+
drm = &priv->drm;
532+
crtc = priv->crtc;
529533
conn = &priv->connector;
530534
KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi);
531535

@@ -536,8 +540,6 @@ static void drm_test_check_broadcast_rgb_full_cea_mode(struct kunit *test)
536540
KUNIT_ASSERT_NOT_NULL(test, preferred);
537541
KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1);
538542

539-
drm = &priv->drm;
540-
crtc = priv->crtc;
541543
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
542544
KUNIT_ASSERT_EQ(test, ret, 0);
543545

@@ -641,6 +643,8 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode(struct kunit *test)
641643
8);
642644
KUNIT_ASSERT_NOT_NULL(test, priv);
643645

646+
drm = &priv->drm;
647+
crtc = priv->crtc;
644648
conn = &priv->connector;
645649
KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi);
646650

@@ -651,8 +655,6 @@ static void drm_test_check_broadcast_rgb_limited_cea_mode(struct kunit *test)
651655
KUNIT_ASSERT_NOT_NULL(test, preferred);
652656
KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1);
653657

654-
drm = &priv->drm;
655-
crtc = priv->crtc;
656658
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
657659
KUNIT_ASSERT_EQ(test, ret, 0);
658660

@@ -758,6 +760,8 @@ static void drm_test_check_output_bpc_crtc_mode_changed(struct kunit *test)
758760
10);
759761
KUNIT_ASSERT_NOT_NULL(test, priv);
760762

763+
drm = &priv->drm;
764+
crtc = priv->crtc;
761765
conn = &priv->connector;
762766
ret = set_connector_edid(test, conn,
763767
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)
770774
preferred = find_preferred_mode(conn);
771775
KUNIT_ASSERT_NOT_NULL(test, preferred);
772776

773-
drm = &priv->drm;
774-
crtc = priv->crtc;
775777
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
776778
KUNIT_ASSERT_EQ(test, ret, 0);
777779

@@ -832,6 +834,8 @@ static void drm_test_check_output_bpc_crtc_mode_not_changed(struct kunit *test)
832834
10);
833835
KUNIT_ASSERT_NOT_NULL(test, priv);
834836

837+
drm = &priv->drm;
838+
crtc = priv->crtc;
835839
conn = &priv->connector;
836840
ret = set_connector_edid(test, conn,
837841
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)
844848
preferred = find_preferred_mode(conn);
845849
KUNIT_ASSERT_NOT_NULL(test, preferred);
846850

847-
drm = &priv->drm;
848-
crtc = priv->crtc;
849851
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
850852
KUNIT_ASSERT_EQ(test, ret, 0);
851853

@@ -903,6 +905,8 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test)
903905
12);
904906
KUNIT_ASSERT_NOT_NULL(test, priv);
905907

908+
drm = &priv->drm;
909+
crtc = priv->crtc;
906910
conn = &priv->connector;
907911
ret = set_connector_edid(test, conn,
908912
test_edid_dvi_1080p,
@@ -918,8 +922,6 @@ static void drm_test_check_output_bpc_dvi(struct kunit *test)
918922
preferred = find_preferred_mode(conn);
919923
KUNIT_ASSERT_NOT_NULL(test, preferred);
920924

921-
drm = &priv->drm;
922-
crtc = priv->crtc;
923925
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
924926
KUNIT_ASSERT_EQ(test, ret, 0);
925927

@@ -950,6 +952,8 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct kunit *test)
950952
8);
951953
KUNIT_ASSERT_NOT_NULL(test, priv);
952954

955+
drm = &priv->drm;
956+
crtc = priv->crtc;
953957
conn = &priv->connector;
954958
ret = set_connector_edid(test, conn,
955959
test_edid_hdmi_1080p_rgb_max_200mhz,
@@ -963,8 +967,6 @@ static void drm_test_check_tmds_char_rate_rgb_8bpc(struct kunit *test)
963967
KUNIT_ASSERT_NOT_NULL(test, preferred);
964968
KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
965969

966-
drm = &priv->drm;
967-
crtc = priv->crtc;
968970
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
969971
KUNIT_ASSERT_EQ(test, ret, 0);
970972

@@ -997,6 +999,8 @@ static void drm_test_check_tmds_char_rate_rgb_10bpc(struct kunit *test)
997999
10);
9981000
KUNIT_ASSERT_NOT_NULL(test, priv);
9991001

1002+
drm = &priv->drm;
1003+
crtc = priv->crtc;
10001004
conn = &priv->connector;
10011005
ret = set_connector_edid(test, conn,
10021006
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)
10101014
KUNIT_ASSERT_NOT_NULL(test, preferred);
10111015
KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
10121016

1013-
drm = &priv->drm;
1014-
crtc = priv->crtc;
10151017
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
10161018
KUNIT_ASSERT_EQ(test, ret, 0);
10171019

@@ -1044,6 +1046,8 @@ static void drm_test_check_tmds_char_rate_rgb_12bpc(struct kunit *test)
10441046
12);
10451047
KUNIT_ASSERT_NOT_NULL(test, priv);
10461048

1049+
drm = &priv->drm;
1050+
crtc = priv->crtc;
10471051
conn = &priv->connector;
10481052
ret = set_connector_edid(test, conn,
10491053
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)
10571061
KUNIT_ASSERT_NOT_NULL(test, preferred);
10581062
KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK);
10591063

1060-
drm = &priv->drm;
1061-
crtc = priv->crtc;
10621064
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
10631065
KUNIT_ASSERT_EQ(test, ret, 0);
10641066

@@ -1095,15 +1097,16 @@ static void drm_test_check_hdmi_funcs_reject_rate(struct kunit *test)
10951097
8);
10961098
KUNIT_ASSERT_NOT_NULL(test, priv);
10971099

1100+
drm = &priv->drm;
1101+
crtc = priv->crtc;
1102+
conn = &priv->connector;
1103+
10981104
ctx = drm_kunit_helper_acquire_ctx_alloc(test);
10991105
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
11001106

1101-
conn = &priv->connector;
11021107
preferred = find_preferred_mode(conn);
11031108
KUNIT_ASSERT_NOT_NULL(test, preferred);
11041109

1105-
drm = &priv->drm;
1106-
crtc = priv->crtc;
11071110
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
11081111
KUNIT_ASSERT_EQ(test, ret, 0);
11091112

@@ -1151,6 +1154,8 @@ static void drm_test_check_max_tmds_rate_bpc_fallback(struct kunit *test)
11511154
12);
11521155
KUNIT_ASSERT_NOT_NULL(test, priv);
11531156

1157+
drm = &priv->drm;
1158+
crtc = priv->crtc;
11541159
conn = &priv->connector;
11551160
ret = set_connector_edid(test, conn,
11561161
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)
11741179
rate = drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB);
11751180
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
11761181

1177-
drm = &priv->drm;
1178-
crtc = priv->crtc;
11791182
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
11801183
KUNIT_EXPECT_EQ(test, ret, 0);
11811184

@@ -1220,6 +1223,8 @@ static void drm_test_check_max_tmds_rate_format_fallback(struct kunit *test)
12201223
12);
12211224
KUNIT_ASSERT_NOT_NULL(test, priv);
12221225

1226+
drm = &priv->drm;
1227+
crtc = priv->crtc;
12231228
conn = &priv->connector;
12241229
ret = set_connector_edid(test, conn,
12251230
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)
12461251
rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);
12471252
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
12481253

1249-
drm = &priv->drm;
1250-
crtc = priv->crtc;
12511254
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
12521255
KUNIT_EXPECT_EQ(test, ret, 0);
12531256

@@ -1343,6 +1346,8 @@ static void drm_test_check_output_bpc_format_driver_rgb_only(struct kunit *test)
13431346
12);
13441347
KUNIT_ASSERT_NOT_NULL(test, priv);
13451348

1349+
drm = &priv->drm;
1350+
crtc = priv->crtc;
13461351
conn = &priv->connector;
13471352
ret = set_connector_edid(test, conn,
13481353
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)
13741379
rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);
13751380
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
13761381

1377-
drm = &priv->drm;
1378-
crtc = priv->crtc;
13791382
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
13801383
KUNIT_EXPECT_EQ(test, ret, 0);
13811384

@@ -1410,6 +1413,8 @@ static void drm_test_check_output_bpc_format_display_rgb_only(struct kunit *test
14101413
12);
14111414
KUNIT_ASSERT_NOT_NULL(test, priv);
14121415

1416+
drm = &priv->drm;
1417+
crtc = priv->crtc;
14131418
conn = &priv->connector;
14141419
ret = set_connector_edid(test, conn,
14151420
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
14411446
rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422);
14421447
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
14431448

1444-
drm = &priv->drm;
1445-
crtc = priv->crtc;
14461449
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
14471450
KUNIT_EXPECT_EQ(test, ret, 0);
14481451

@@ -1476,6 +1479,8 @@ static void drm_test_check_output_bpc_format_driver_8bpc_only(struct kunit *test
14761479
8);
14771480
KUNIT_ASSERT_NOT_NULL(test, priv);
14781481

1482+
drm = &priv->drm;
1483+
crtc = priv->crtc;
14791484
conn = &priv->connector;
14801485
ret = set_connector_edid(test, conn,
14811486
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
14991504
rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
15001505
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
15011506

1502-
drm = &priv->drm;
1503-
crtc = priv->crtc;
15041507
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
15051508
KUNIT_EXPECT_EQ(test, ret, 0);
15061509

@@ -1536,6 +1539,8 @@ static void drm_test_check_output_bpc_format_display_8bpc_only(struct kunit *tes
15361539
12);
15371540
KUNIT_ASSERT_NOT_NULL(test, priv);
15381541

1542+
drm = &priv->drm;
1543+
crtc = priv->crtc;
15391544
conn = &priv->connector;
15401545
ret = set_connector_edid(test, conn,
15411546
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
15591564
rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB);
15601565
KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000);
15611566

1562-
drm = &priv->drm;
1563-
crtc = priv->crtc;
15641567
ret = light_up_connector(test, drm, crtc, conn, preferred, ctx);
15651568
KUNIT_EXPECT_EQ(test, ret, 0);
15661569

0 commit comments

Comments
 (0)