tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Maxime Ripard 6b6bfd63 bb4f929a

+42 -39
+42 -39
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
··· 289 289 8); 290 290 KUNIT_ASSERT_NOT_NULL(test, priv); 291 291 292 + drm = &priv->drm; 293 + crtc = priv->crtc; 294 + conn = &priv->connector; 295 + 292 296 ctx = drm_kunit_helper_acquire_ctx_alloc(test); 293 297 KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); 294 298 295 - conn = &priv->connector; 296 299 preferred = find_preferred_mode(conn); 297 300 KUNIT_ASSERT_NOT_NULL(test, preferred); 298 301 299 - drm = &priv->drm; 300 - crtc = priv->crtc; 301 302 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 302 303 KUNIT_ASSERT_EQ(test, ret, 0); 303 304 ··· 353 352 8); 354 353 KUNIT_ASSERT_NOT_NULL(test, priv); 355 354 355 + drm = &priv->drm; 356 + crtc = priv->crtc; 357 + conn = &priv->connector; 358 + 356 359 ctx = drm_kunit_helper_acquire_ctx_alloc(test); 357 360 KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); 358 361 359 - conn = &priv->connector; 360 362 preferred = find_preferred_mode(conn); 361 363 KUNIT_ASSERT_NOT_NULL(test, preferred); 362 364 363 - drm = &priv->drm; 364 - crtc = priv->crtc; 365 365 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 366 366 KUNIT_ASSERT_EQ(test, ret, 0); 367 367 ··· 417 415 8); 418 416 KUNIT_ASSERT_NOT_NULL(test, priv); 419 417 418 + drm = &priv->drm; 419 + crtc = priv->crtc; 420 420 conn = &priv->connector; 421 421 KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi); 422 422 ··· 429 425 KUNIT_ASSERT_NOT_NULL(test, preferred); 430 426 KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); 431 427 432 - drm = &priv->drm; 433 - crtc = priv->crtc; 434 428 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 435 429 KUNIT_ASSERT_EQ(test, ret, 0); 436 430 ··· 528 526 8); 529 527 KUNIT_ASSERT_NOT_NULL(test, priv); 530 528 529 + drm = &priv->drm; 530 + crtc = priv->crtc; 531 531 conn = &priv->connector; 532 532 KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi); 533 533 ··· 540 536 KUNIT_ASSERT_NOT_NULL(test, preferred); 541 537 KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); 542 538 543 - drm = &priv->drm; 544 - crtc = priv->crtc; 545 539 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 546 540 KUNIT_ASSERT_EQ(test, ret, 0); 547 541 ··· 643 641 8); 644 642 KUNIT_ASSERT_NOT_NULL(test, priv); 645 643 644 + drm = &priv->drm; 645 + crtc = priv->crtc; 646 646 conn = &priv->connector; 647 647 KUNIT_ASSERT_TRUE(test, conn->display_info.is_hdmi); 648 648 ··· 655 651 KUNIT_ASSERT_NOT_NULL(test, preferred); 656 652 KUNIT_ASSERT_NE(test, drm_match_cea_mode(preferred), 1); 657 653 658 - drm = &priv->drm; 659 - crtc = priv->crtc; 660 654 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 661 655 KUNIT_ASSERT_EQ(test, ret, 0); 662 656 ··· 760 758 10); 761 759 KUNIT_ASSERT_NOT_NULL(test, priv); 762 760 761 + drm = &priv->drm; 762 + crtc = priv->crtc; 763 763 conn = &priv->connector; 764 764 ret = set_connector_edid(test, conn, 765 765 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz, ··· 774 770 preferred = find_preferred_mode(conn); 775 771 KUNIT_ASSERT_NOT_NULL(test, preferred); 776 772 777 - drm = &priv->drm; 778 - crtc = priv->crtc; 779 773 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 780 774 KUNIT_ASSERT_EQ(test, ret, 0); 781 775 ··· 834 832 10); 835 833 KUNIT_ASSERT_NOT_NULL(test, priv); 836 834 835 + drm = &priv->drm; 836 + crtc = priv->crtc; 837 837 conn = &priv->connector; 838 838 ret = set_connector_edid(test, conn, 839 839 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz, ··· 848 844 preferred = find_preferred_mode(conn); 849 845 KUNIT_ASSERT_NOT_NULL(test, preferred); 850 846 851 - drm = &priv->drm; 852 - crtc = priv->crtc; 853 847 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 854 848 KUNIT_ASSERT_EQ(test, ret, 0); 855 849 ··· 905 903 12); 906 904 KUNIT_ASSERT_NOT_NULL(test, priv); 907 905 906 + drm = &priv->drm; 907 + crtc = priv->crtc; 908 908 conn = &priv->connector; 909 909 ret = set_connector_edid(test, conn, 910 910 test_edid_dvi_1080p, ··· 922 918 preferred = find_preferred_mode(conn); 923 919 KUNIT_ASSERT_NOT_NULL(test, preferred); 924 920 925 - drm = &priv->drm; 926 - crtc = priv->crtc; 927 921 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 928 922 KUNIT_ASSERT_EQ(test, ret, 0); 929 923 ··· 952 950 8); 953 951 KUNIT_ASSERT_NOT_NULL(test, priv); 954 952 953 + drm = &priv->drm; 954 + crtc = priv->crtc; 955 955 conn = &priv->connector; 956 956 ret = set_connector_edid(test, conn, 957 957 test_edid_hdmi_1080p_rgb_max_200mhz, ··· 967 963 KUNIT_ASSERT_NOT_NULL(test, preferred); 968 964 KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); 969 965 970 - drm = &priv->drm; 971 - crtc = priv->crtc; 972 966 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 973 967 KUNIT_ASSERT_EQ(test, ret, 0); 974 968 ··· 999 997 10); 1000 998 KUNIT_ASSERT_NOT_NULL(test, priv); 1001 999 1000 + drm = &priv->drm; 1001 + crtc = priv->crtc; 1002 1002 conn = &priv->connector; 1003 1003 ret = set_connector_edid(test, conn, 1004 1004 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz, ··· 1014 1010 KUNIT_ASSERT_NOT_NULL(test, preferred); 1015 1011 KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); 1016 1012 1017 - drm = &priv->drm; 1018 - crtc = priv->crtc; 1019 1013 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 1020 1014 KUNIT_ASSERT_EQ(test, ret, 0); 1021 1015 ··· 1046 1044 12); 1047 1045 KUNIT_ASSERT_NOT_NULL(test, priv); 1048 1046 1047 + drm = &priv->drm; 1048 + crtc = priv->crtc; 1049 1049 conn = &priv->connector; 1050 1050 ret = set_connector_edid(test, conn, 1051 1051 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz, ··· 1061 1057 KUNIT_ASSERT_NOT_NULL(test, preferred); 1062 1058 KUNIT_ASSERT_FALSE(test, preferred->flags & DRM_MODE_FLAG_DBLCLK); 1063 1059 1064 - drm = &priv->drm; 1065 - crtc = priv->crtc; 1066 1060 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 1067 1061 KUNIT_ASSERT_EQ(test, ret, 0); 1068 1062 ··· 1097 1095 8); 1098 1096 KUNIT_ASSERT_NOT_NULL(test, priv); 1099 1097 1098 + drm = &priv->drm; 1099 + crtc = priv->crtc; 1100 + conn = &priv->connector; 1101 + 1100 1102 ctx = drm_kunit_helper_acquire_ctx_alloc(test); 1101 1103 KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx); 1102 1104 1103 - conn = &priv->connector; 1104 1105 preferred = find_preferred_mode(conn); 1105 1106 KUNIT_ASSERT_NOT_NULL(test, preferred); 1106 1107 1107 - drm = &priv->drm; 1108 - crtc = priv->crtc; 1109 1108 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 1110 1109 KUNIT_ASSERT_EQ(test, ret, 0); 1111 1110 ··· 1154 1151 12); 1155 1152 KUNIT_ASSERT_NOT_NULL(test, priv); 1156 1153 1154 + drm = &priv->drm; 1155 + crtc = priv->crtc; 1157 1156 conn = &priv->connector; 1158 1157 ret = set_connector_edid(test, conn, 1159 1158 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz, ··· 1179 1174 rate = drm_hdmi_compute_mode_clock(preferred, 10, HDMI_COLORSPACE_RGB); 1180 1175 KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); 1181 1176 1182 - drm = &priv->drm; 1183 - crtc = priv->crtc; 1184 1177 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 1185 1178 KUNIT_EXPECT_EQ(test, ret, 0); 1186 1179 ··· 1223 1220 12); 1224 1221 KUNIT_ASSERT_NOT_NULL(test, priv); 1225 1222 1223 + drm = &priv->drm; 1224 + crtc = priv->crtc; 1226 1225 conn = &priv->connector; 1227 1226 ret = set_connector_edid(test, conn, 1228 1227 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz, ··· 1251 1246 rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422); 1252 1247 KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); 1253 1248 1254 - drm = &priv->drm; 1255 - crtc = priv->crtc; 1256 1249 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 1257 1250 KUNIT_EXPECT_EQ(test, ret, 0); 1258 1251 ··· 1346 1343 12); 1347 1344 KUNIT_ASSERT_NOT_NULL(test, priv); 1348 1345 1346 + drm = &priv->drm; 1347 + crtc = priv->crtc; 1349 1348 conn = &priv->connector; 1350 1349 ret = set_connector_edid(test, conn, 1351 1350 test_edid_hdmi_1080p_rgb_yuv_dc_max_200mhz, ··· 1379 1374 rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422); 1380 1375 KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); 1381 1376 1382 - drm = &priv->drm; 1383 - crtc = priv->crtc; 1384 1377 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 1385 1378 KUNIT_EXPECT_EQ(test, ret, 0); 1386 1379 ··· 1413 1410 12); 1414 1411 KUNIT_ASSERT_NOT_NULL(test, priv); 1415 1412 1413 + drm = &priv->drm; 1414 + crtc = priv->crtc; 1416 1415 conn = &priv->connector; 1417 1416 ret = set_connector_edid(test, conn, 1418 1417 test_edid_hdmi_1080p_rgb_max_200mhz, ··· 1446 1441 rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_YUV422); 1447 1442 KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); 1448 1443 1449 - drm = &priv->drm; 1450 - crtc = priv->crtc; 1451 1444 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 1452 1445 KUNIT_EXPECT_EQ(test, ret, 0); 1453 1446 ··· 1479 1476 8); 1480 1477 KUNIT_ASSERT_NOT_NULL(test, priv); 1481 1478 1479 + drm = &priv->drm; 1480 + crtc = priv->crtc; 1482 1481 conn = &priv->connector; 1483 1482 ret = set_connector_edid(test, conn, 1484 1483 test_edid_hdmi_1080p_rgb_yuv_dc_max_340mhz, ··· 1504 1499 rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB); 1505 1500 KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); 1506 1501 1507 - drm = &priv->drm; 1508 - crtc = priv->crtc; 1509 1502 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 1510 1503 KUNIT_EXPECT_EQ(test, ret, 0); 1511 1504 ··· 1539 1536 12); 1540 1537 KUNIT_ASSERT_NOT_NULL(test, priv); 1541 1538 1539 + drm = &priv->drm; 1540 + crtc = priv->crtc; 1542 1541 conn = &priv->connector; 1543 1542 ret = set_connector_edid(test, conn, 1544 1543 test_edid_hdmi_1080p_rgb_max_340mhz, ··· 1564 1559 rate = drm_hdmi_compute_mode_clock(preferred, 12, HDMI_COLORSPACE_RGB); 1565 1560 KUNIT_ASSERT_LT(test, rate, info->max_tmds_clock * 1000); 1566 1561 1567 - drm = &priv->drm; 1568 - crtc = priv->crtc; 1569 1562 ret = light_up_connector(test, drm, crtc, conn, preferred, ctx); 1570 1563 KUNIT_EXPECT_EQ(test, ret, 0); 1571 1564