* [igt-dev] [i-g-t 0/3] tests/kms_pipe_crc_basic: IGT test cleanup
@ 2022-06-10 7:14 Bhanuprakash Modem
2022-06-10 7:14 ` [igt-dev] [i-g-t 1/3] tests/kms_cursor_legacy: Convert tests to dynamic Bhanuprakash Modem
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Bhanuprakash Modem @ 2022-06-10 7:14 UTC (permalink / raw)
To: igt-dev, swati2.sharma
Convert all possible subtests to dynamic and sanitize the system
statte before starting/exiting the subtest. This series will also
rename the tests in BAT with updated ones.
Bhanuprakash Modem (3):
tests/kms_cursor_legacy: Convert tests to dynamic
tests/kms_cursor_legacy: Test Cleanup
tests/intel-ci: Rename kms_cursor_legacy subtests in BAT
tests/intel-ci/fast-feedback.testlist | 11 +-
tests/kms_cursor_legacy.c | 411 +++++++++++++++++---------
2 files changed, 269 insertions(+), 153 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] [i-g-t 1/3] tests/kms_cursor_legacy: Convert tests to dynamic
2022-06-10 7:14 [igt-dev] [i-g-t 0/3] tests/kms_pipe_crc_basic: IGT test cleanup Bhanuprakash Modem
@ 2022-06-10 7:14 ` Bhanuprakash Modem
2022-06-10 7:14 ` [igt-dev] [i-g-t 2/3] tests/kms_cursor_legacy: Test Cleanup Bhanuprakash Modem
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Bhanuprakash Modem @ 2022-06-10 7:14 UTC (permalink / raw)
To: igt-dev, swati2.sharma
Convert the existing subtests to dynamic subtests.
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
tests/kms_cursor_legacy.c | 259 +++++++++++++++++++++-----------------
1 file changed, 141 insertions(+), 118 deletions(-)
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
index 47b9b4e1..8f5e5fd2 100644
--- a/tests/kms_cursor_legacy.c
+++ b/tests/kms_cursor_legacy.c
@@ -1424,6 +1424,15 @@ igt_main
igt_display_t display = { .drm_fd = -1 };
bool intel_psr2_restore = false;
int i;
+ const char *modes[flip_test_last+1] = {
+ "legacy",
+ "varying-size",
+ "toggle",
+ "atomic",
+ "atomic-transitions",
+ "atomic-transitions-varying-size"
+ };
+ const char *prefix[2] = {"basic", "short"};
igt_fixture {
display.drm_fd = drm_open_driver_master(DRIVER_ANY);
@@ -1438,55 +1447,42 @@ igt_main
intel_psr2_restore = i915_psr2_sel_fetch_to_psr1(display.drm_fd);
}
- /*Test description for pipe-* and all-pipe-* tests*/
igt_describe("Test checks how many cursor updates we can fit between vblanks "
- "on single pipe with different modes, priority and number of processes");
+ "on single/all pipes with different modes, priority and number of processes");
igt_subtest_group {
enum pipe n;
- for_each_pipe_static(n) {
- errno = 0;
-
- igt_fixture {
- igt_require_pipe(&display, n);
- }
+ struct {
+ const char *name;
+ int ncpus;
+ unsigned flags;
+ } tests[] = {
+ { "single-bo", 1, DRM_MODE_CURSOR_BO },
+ { "single-move", 1, DRM_MODE_CURSOR_MOVE },
+ { "forked-bo", ncpus, DRM_MODE_CURSOR_BO },
+ { "forked-move", ncpus, DRM_MODE_CURSOR_MOVE },
+ { "torture-bo", -ncpus, DRM_MODE_CURSOR_BO },
+ { "torture-move", -ncpus, DRM_MODE_CURSOR_MOVE },
+ };
- igt_subtest_f("pipe-%s-single-bo", kmstest_pipe_name(n))
- stress(&display, n, 1, DRM_MODE_CURSOR_BO, 20);
- igt_subtest_f("pipe-%s-single-move", kmstest_pipe_name(n))
- stress(&display, n, 1, DRM_MODE_CURSOR_MOVE, 20);
+ for (i = 0; i < ARRAY_SIZE(tests); i++) {
+ igt_subtest_with_dynamic(tests[i].name) {
+ for_each_pipe(&display, n) {
+ errno = 0;
- igt_subtest_f("pipe-%s-forked-bo", kmstest_pipe_name(n))
- stress(&display, n, ncpus, DRM_MODE_CURSOR_BO, 20);
- igt_subtest_f("pipe-%s-forked-move", kmstest_pipe_name(n))
- stress(&display, n, ncpus, DRM_MODE_CURSOR_MOVE, 20);
+ igt_dynamic_f("pipe-%s", kmstest_pipe_name(n))
+ stress(&display, n, tests[i].ncpus, tests[i].flags, 20);
+ }
- igt_subtest_f("pipe-%s-torture-bo", kmstest_pipe_name(n))
- stress(&display, n, -ncpus, DRM_MODE_CURSOR_BO, 20);
- igt_subtest_f("pipe-%s-torture-move", kmstest_pipe_name(n))
- stress(&display, n, -ncpus, DRM_MODE_CURSOR_MOVE, 20);
+ errno = 0;
+ igt_dynamic("all-pipes")
+ stress(&display, -1, tests[i].ncpus, tests[i].flags, 20);
+ }
}
}
- /*Test description for pipe-* and all-pipe-* tests*/
igt_describe("Test checks how many cursor updates we can fit between vblanks "
"on all pipes with different modes, priority and number of processes");
igt_subtest_group {
-
- igt_subtest("all-pipes-single-bo")
- stress(&display, -1, 1, DRM_MODE_CURSOR_BO, 20);
- igt_subtest("all-pipes-single-move")
- stress(&display, -1, 1, DRM_MODE_CURSOR_MOVE, 20);
-
- igt_subtest("all-pipes-forked-bo")
- stress(&display, -1, ncpus, DRM_MODE_CURSOR_BO, 20);
- igt_subtest("all-pipes-forked-move")
- stress(&display, -1, ncpus, DRM_MODE_CURSOR_MOVE, 20);
-
- igt_subtest("all-pipes-torture-bo")
- stress(&display, -1, -ncpus, DRM_MODE_CURSOR_BO, 20);
- igt_subtest("all-pipes-torture-move")
- stress(&display, -1, -ncpus, DRM_MODE_CURSOR_MOVE, 20);
-
igt_subtest("nonblocking-modeset-vs-cursor-atomic")
nonblocking_modeset_vs_cursor(&display, 1);
@@ -1494,43 +1490,54 @@ igt_main
nonblocking_modeset_vs_cursor(&display, 16);
}
- /*Test Description for 2x-* tests*/
igt_describe("This test executes flips on both CRTCs "
"while running cursor updates in parallel");
igt_subtest_group {
+ struct {
+ const char *name;
+ int nloops;
+ bool modeset;
+ bool atomic;
+ } tests[] = {
+ { "2x-flip-vs-cursor-legacy", 8, false, false },
+ { "2x-flip-vs-cursor-atomic", 8, false, true },
+ { "2x-long-flip-vs-cursor-legacy", 150, false, false },
+ { "2x-long-flip-vs-cursor-atomic", 150, false, true },
+ { "2x-nonblocking-modeset-vs-cursor-atomic", 4, true, true },
+ { "2x-long-nonblocking-modeset-vs-cursor-atomic", 15, true, true },
+ };
- igt_subtest("2x-flip-vs-cursor-legacy")
- two_screens_flip_vs_cursor(&display, 8, false, false);
-
- igt_subtest("2x-flip-vs-cursor-atomic")
- two_screens_flip_vs_cursor(&display, 8, false, true);
-
- igt_subtest("2x-cursor-vs-flip-legacy")
- two_screens_cursor_vs_flip(&display, 8, false);
-
- igt_subtest("2x-long-flip-vs-cursor-legacy")
- two_screens_flip_vs_cursor(&display, 150, false, false);
-
- igt_subtest("2x-long-flip-vs-cursor-atomic")
- two_screens_flip_vs_cursor(&display, 150, false, true);
-
- igt_subtest("2x-long-cursor-vs-flip-legacy")
- two_screens_cursor_vs_flip(&display, 50, false);
-
- igt_subtest("2x-nonblocking-modeset-vs-cursor-atomic")
- two_screens_flip_vs_cursor(&display, 4, true, true);
-
- igt_subtest("2x-cursor-vs-flip-atomic")
- two_screens_cursor_vs_flip(&display, 8, true);
+ for (i = 0; i < ARRAY_SIZE(tests); i++) {
+ igt_subtest(tests[i].name)
+ two_screens_flip_vs_cursor(&display,
+ tests[i].nloops,
+ tests[i].modeset,
+ tests[i].atomic);
+ }
+ }
- igt_subtest("2x-long-nonblocking-modeset-vs-cursor-atomic")
- two_screens_flip_vs_cursor(&display, 15, true, true);
+ igt_describe("This test executes flips on both CRTCs "
+ "while running cursor updates in parallel");
+ igt_subtest_group {
+ struct {
+ const char *name;
+ int nloops;
+ bool atomic;
+ } tests[] = {
+ { "2x-cursor-vs-flip-legacy", 8, false },
+ { "2x-long-cursor-vs-flip-legacy", 50, false },
+ { "2x-cursor-vs-flip-atomic", 8, true },
+ { "2x-long-cursor-vs-flip-atomic", 50, true },
+ };
- igt_subtest("2x-long-cursor-vs-flip-atomic")
- two_screens_cursor_vs_flip(&display, 50, true);
+ for (i = 0; i < ARRAY_SIZE(tests); i++) {
+ igt_subtest(tests[i].name)
+ two_screens_cursor_vs_flip(&display,
+ tests[i].nloops,
+ tests[i].atomic);
+ }
}
- /*Test description for cursor-crc tests*/
igt_describe("Test will first does a page flip and then cursor update");
igt_subtest_group {
igt_fixture
@@ -1543,7 +1550,6 @@ igt_main
flip_vs_cursor_crc(&display, true);
}
- /*Test description for busy-crc tests*/
igt_describe("this test perform a busy bo update followed by a cursor update");
igt_subtest_group {
igt_fixture
@@ -1556,69 +1562,86 @@ igt_main
flip_vs_cursor_busy_crc(&display, true);
}
- for (i = 0; i <= flip_test_last; i++) {
- const char *modes[flip_test_last+1] = {
- "legacy",
- "varying-size",
- "toggle",
- "atomic",
- "atomic-transitions",
- "atomic-transitions-varying-size"
- };
- const char *prefix = "short-";
+ for (i = 0; i < ARRAY_SIZE(prefix); i++) {
+ int j;
- switch (i) {
- case flip_test_legacy:
- case flip_test_varying_size:
- case flip_test_atomic:
- prefix = "basic-";
- break;
- default: break;
- }
+ igt_describe("Adds variety of tests:\n"
+ "* varying-size: change the size of cursor b/w 64*64 to maxw x maxh.\n"
+ "* atomic-transition: alternates between a full screen sprite plane "
+ "and full screen primary plane.\n"
+ "* toggle: which toggles cursor visibility and make sure cursor moves between updates.");
+ igt_subtest_group {
+ igt_subtest_with_dynamic_f("%s-flip-before-cursor", prefix[i]) {
+ for (j = 0; j <= flip_test_last; j++) {
+ igt_dynamic_f("%s", modes[j])
+ basic_flip_cursor(&display, j, FLIP_BEFORE_CURSOR, 0);
+ }
+ }
- igt_describe("Adds variety of tests: "
- "varying-size: change the size of cursor b/w 64*64 to maxw x maxh. "
- "atomic-transition: alternates between a full screen sprite plane. "
- "and full screen primary plane. "
- "toggle: which toggles cursor visibility and make sure cursor moves between updates.");
- igt_subtest_group {
- igt_subtest_f("%sflip-before-cursor-%s", prefix, modes[i])
- basic_flip_cursor(&display, i, FLIP_BEFORE_CURSOR, 0);
-
- igt_subtest_f("%sbusy-flip-before-cursor-%s", prefix, modes[i]) {
- igt_require(!cursor_slowpath(&display, i));
- igt_require_gem(display.drm_fd);
- basic_flip_cursor(&display, i, FLIP_BEFORE_CURSOR,
- BASIC_BUSY);
- }
- }
+ igt_subtest_with_dynamic_f("%s-busy-flip-before-cursor", prefix[i]) {
+ igt_require(!cursor_slowpath(&display, i));
+ igt_require_gem(display.drm_fd);
- igt_describe("The essence of the basic test is that neither the cursor nor the "
- "nonblocking flip stall the application of the next");
- igt_subtest_group {
+ for (j = 0; j <= flip_test_last; j++) {
+ igt_dynamic_f("%s", modes[j])
+ basic_flip_cursor(&display, j, FLIP_BEFORE_CURSOR, BASIC_BUSY);
+ }
+ }
- igt_subtest_f("%sflip-after-cursor-%s", prefix, modes[i])
- basic_flip_cursor(&display, i, FLIP_AFTER_CURSOR, 0);
+ igt_subtest_with_dynamic_f("%s-flip-after-cursor", prefix[i]) {
+ for (j = 0; j <= flip_test_last; j++) {
+ igt_dynamic_f("%s", modes[j])
+ basic_flip_cursor(&display, j, FLIP_AFTER_CURSOR, 0);
+ }
+ }
+ }
+ }
- igt_subtest_f("flip-vs-cursor-%s", modes[i])
- flip_vs_cursor(&display, i, 150);
+ igt_describe("The essence of the basic test is that neither the cursor nor the "
+ "nonblocking flip stall the application of the next");
+ igt_subtest_group {
+ igt_subtest_with_dynamic("flip-vs-cursor") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip_vs_cursor(&display, i, 150);
+ }
+ }
- igt_subtest_f("cursor-vs-flip-%s", modes[i])
- cursor_vs_flip(&display, i, 50);
+ igt_subtest_with_dynamic("cursor-vs-flip") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ cursor_vs_flip(&display, i, 50);
+ }
+ }
- igt_subtest_f("cursorA-vs-flipA-%s", modes[i])
- flip(&display, 0, 0, 10, i);
+ igt_subtest_with_dynamic("cursorA-vs-flipA") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip(&display, 0, 0, 10, i);
+ }
+ }
- igt_subtest_f("cursorA-vs-flipB-%s", modes[i])
- flip(&display, 0, 1, 10, i);
+ igt_subtest_with_dynamic("cursorA-vs-flipB") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip(&display, 0, 1, 10, i);
+ }
+ }
- igt_subtest_f("cursorB-vs-flipA-%s", modes[i])
- flip(&display, 1, 0, 10, i);
+ igt_subtest_with_dynamic("cursorB-vs-flipA") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip(&display, 1, 0, 10, i);
+ }
+ }
- igt_subtest_f("cursorB-vs-flipB-%s", modes[i])
- flip(&display, 1, 1, 10, i);
+ igt_subtest_with_dynamic("cursorB-vs-flipB") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip(&display, 1, 1, 10, i);
}
}
+ }
igt_fixture {
if (intel_psr2_restore)
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] [i-g-t 2/3] tests/kms_cursor_legacy: Test Cleanup
2022-06-10 7:14 [igt-dev] [i-g-t 0/3] tests/kms_pipe_crc_basic: IGT test cleanup Bhanuprakash Modem
2022-06-10 7:14 ` [igt-dev] [i-g-t 1/3] tests/kms_cursor_legacy: Convert tests to dynamic Bhanuprakash Modem
@ 2022-06-10 7:14 ` Bhanuprakash Modem
2022-06-10 7:14 ` [igt-dev] [i-g-t 3/3] tests/intel-ci: Rename kms_cursor_legacy subtests in BAT Bhanuprakash Modem
2022-06-10 12:19 ` [igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_pipe_crc_basic: IGT test cleanup (rev2) Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Bhanuprakash Modem @ 2022-06-10 7:14 UTC (permalink / raw)
To: igt-dev, swati2.sharma
Clear the system state before exiting the subtest.
V2: Fix Crash in *-modeset-vs-cursor-atomic test
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
tests/kms_cursor_legacy.c | 158 ++++++++++++++++++++++++++++++--------
1 file changed, 128 insertions(+), 30 deletions(-)
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
index 8f5e5fd2..fc4a291d 100644
--- a/tests/kms_cursor_legacy.c
+++ b/tests/kms_cursor_legacy.c
@@ -204,7 +204,8 @@ static igt_output_t *set_fb_on_crtc(igt_display_t *display, enum pipe pipe, stru
return NULL;
}
-static void set_cursor_on_pipe(igt_display_t *display, enum pipe pipe, struct igt_fb *fb)
+static igt_plane_t
+*set_cursor_on_pipe(igt_display_t *display, enum pipe pipe, struct igt_fb *fb)
{
igt_plane_t *plane, *cursor = NULL;
@@ -218,6 +219,8 @@ static void set_cursor_on_pipe(igt_display_t *display, enum pipe pipe, struct ig
igt_require(cursor);
igt_plane_set_fb(cursor, fb);
+
+ return cursor;
}
static void populate_cursor_args(igt_display_t *display, enum pipe pipe,
@@ -421,6 +424,7 @@ static void flip(igt_display_t *display,
uint64_t *results;
struct igt_fb fb_info, fb_info2, argb_fb, cursor_fb, cursor_fb2;
igt_output_t *output, *output2;
+ igt_plane_t *cursor;
results = mmap(NULL, PAGE_SIZE, PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
igt_assert(results != MAP_FAILED);
@@ -449,7 +453,7 @@ static void flip(igt_display_t *display,
igt_create_color_fb(display->drm_fd, fb_info.width, fb_info.height, DRM_FORMAT_ARGB8888, 0, .5, .5, .5, &cursor_fb);
igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
- set_cursor_on_pipe(display, cursor_pipe, &cursor_fb);
+ cursor = set_cursor_on_pipe(display, cursor_pipe, &cursor_fb);
populate_cursor_args(display, cursor_pipe, arg, &cursor_fb);
prepare_flip_test(display, mode, flip_pipe, cursor_pipe, arg, &fb_info, &argb_fb, &cursor_fb2);
@@ -496,6 +500,18 @@ static void flip(igt_display_t *display,
munmap(results, PAGE_SIZE);
+ /* Clean-up */
+ igt_plane_set_fb(cursor, NULL);
+ igt_plane_set_fb(igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ igt_output_set_pipe(output, PIPE_NONE);
+ if (flip_pipe != cursor_pipe) {
+ igt_plane_set_fb(igt_output_get_plane_type(output2, DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ igt_output_set_pipe(output2, PIPE_NONE);
+ }
+ igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+
igt_remove_fb(display->drm_fd, &fb_info);
if (flip_pipe != cursor_pipe)
igt_remove_fb(display->drm_fd, &fb_info2);
@@ -526,6 +542,8 @@ static void basic_flip_cursor(igt_display_t *display,
uint64_t ahnd = 0;
igt_spin_t *spin;
int i, miss1 = 0, miss2 = 0, delta;
+ igt_output_t *output;
+ igt_plane_t *cursor;
if (flags & BASIC_BUSY)
{
@@ -536,10 +554,10 @@ static void basic_flip_cursor(igt_display_t *display,
if (mode >= flip_test_atomic)
igt_require(display->is_atomic);
- igt_require(set_fb_on_crtc(display, pipe, &fb_info));
+ igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
- set_cursor_on_pipe(display, pipe, &cursor_fb);
+ cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
populate_cursor_args(display, pipe, arg, &cursor_fb);
prepare_flip_test(display, mode, pipe, pipe, arg, &fb_info, &argb_fb, &cursor_fb2);
@@ -638,6 +656,13 @@ static void basic_flip_cursor(igt_display_t *display,
if (miss1 || miss2)
igt_info("Failed to evade %i vblanks and missed %i page flips\n", miss1, miss2);
+ /* Clean-up */
+ igt_plane_set_fb(igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ igt_plane_set_fb(cursor, NULL);
+ igt_output_set_pipe(output, PIPE_NONE);
+ igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+
igt_remove_fb(display->drm_fd, &fb_info);
igt_remove_fb(display->drm_fd, &cursor_fb);
@@ -687,14 +712,16 @@ static void flip_vs_cursor(igt_display_t *display, enum flip_test mode, int nloo
enum pipe pipe = find_connected_pipe(display, false);
volatile unsigned long *shared;
cpu_set_t mask, oldmask;
+ igt_output_t *output;
+ igt_plane_t *cursor;
if (mode >= flip_test_atomic)
igt_require(display->is_atomic);
- igt_require(set_fb_on_crtc(display, pipe, &fb_info));
+ igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
- set_cursor_on_pipe(display, pipe, &cursor_fb);
+ cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
populate_cursor_args(display, pipe, arg, &cursor_fb);
prepare_flip_test(display, mode, pipe, pipe, arg, &fb_info, &argb_fb, &cursor_fb2);
@@ -788,6 +815,13 @@ static void flip_vs_cursor(igt_display_t *display, enum flip_test mode, int nloo
sched_setaffinity(0, sizeof(oldmask), &oldmask);
}
+ /* Clean-up */
+ igt_plane_set_fb(igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ igt_plane_set_fb(cursor, NULL);
+ igt_output_set_pipe(output, PIPE_NONE);
+ igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+
igt_remove_fb(display->drm_fd, &fb_info);
igt_remove_fb(display->drm_fd, &cursor_fb);
@@ -803,25 +837,16 @@ static void nonblocking_modeset_vs_cursor(igt_display_t *display, int loops)
igt_output_t *output;
enum pipe pipe = find_connected_pipe(display, false);
struct drm_mode_cursor arg[2];
- igt_plane_t *cursor = NULL, *plane;
+ igt_plane_t *primary, *cursor = NULL;
igt_require(display->is_atomic);
igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
+ primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
- set_cursor_on_pipe(display, pipe, &cursor_fb);
+ cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
populate_cursor_args(display, pipe, arg, &cursor_fb);
arg[0].flags |= DRM_MODE_CURSOR_BO;
- for_each_plane_on_pipe(display, pipe, plane) {
- if (plane->type != DRM_PLANE_TYPE_CURSOR)
- continue;
-
- cursor = plane;
- break;
- }
-
- igt_skip_on(!cursor);
-
/*
* Start disabled. No way around it, since the first atomic
* commit may be unreliable with amount of events sent.
@@ -876,6 +901,11 @@ static void nonblocking_modeset_vs_cursor(igt_display_t *display, int loops)
igt_reset_timeout();
}
+ igt_plane_set_fb(primary, NULL);
+ igt_plane_set_fb(cursor, NULL);
+ igt_output_set_pipe(output, PIPE_NONE);
+ igt_display_commit2(display, COMMIT_ATOMIC);
+
igt_remove_fb(display->drm_fd, &fb_info);
igt_remove_fb(display->drm_fd, &cursor_fb);
}
@@ -905,6 +935,7 @@ static void two_screens_flip_vs_cursor(igt_display_t *display, int nloops, bool
unsigned flags = 0, vblank_start;
struct drm_event_vblank vbl;
int ret;
+ igt_plane_t *cursor, *cursor2;
if (modeset) {
uint64_t val;
@@ -932,17 +963,16 @@ static void two_screens_flip_vs_cursor(igt_display_t *display, int nloops, bool
}
igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
- set_cursor_on_pipe(display, pipe, &cursor_fb);
+ cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
populate_cursor_args(display, pipe, arg1, &cursor_fb);
arg1[1].x = arg1[1].y = 192;
- set_cursor_on_pipe(display, pipe2, &cursor_fb);
+ cursor2 = set_cursor_on_pipe(display, pipe2, &cursor_fb);
populate_cursor_args(display, pipe2, arg2, &cursor_fb);
arg2[1].x = arg2[1].y = 192;
-
igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
igt_fork(child, 2) {
@@ -1056,6 +1086,18 @@ done:
shared[0] = 1;
igt_waitchildren();
+ /* Clean-up */
+ igt_plane_set_fb(igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ if (enabled)
+ igt_plane_set_fb(igt_output_get_plane_type(output2, DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ igt_plane_set_fb(cursor, NULL);
+ igt_plane_set_fb(cursor2, NULL);
+ igt_output_set_pipe(output, PIPE_NONE);
+ igt_output_set_pipe(output2, PIPE_NONE);
+ igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+
igt_remove_fb(display->drm_fd, &fb_info);
igt_remove_fb(display->drm_fd, &fb2_info);
igt_remove_fb(display->drm_fd, &cursor_fb);
@@ -1074,6 +1116,7 @@ static void cursor_vs_flip(igt_display_t *display, enum flip_test mode, int nloo
igt_output_t *output;
uint32_t vrefresh;
int fail_count;
+ igt_plane_t *cursor;
if (mode >= flip_test_atomic)
igt_require(display->is_atomic);
@@ -1085,7 +1128,7 @@ static void cursor_vs_flip(igt_display_t *display, enum flip_test mode, int nloo
vrefresh = igt_output_get_mode(output)->vrefresh;
igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
- set_cursor_on_pipe(display, pipe, &cursor_fb);
+ cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
populate_cursor_args(display, pipe, arg, &cursor_fb);
prepare_flip_test(display, mode, pipe, pipe, arg, &fb_info, &argb_fb, &cursor_fb2);
@@ -1150,6 +1193,13 @@ static void cursor_vs_flip(igt_display_t *display, enum flip_test mode, int nloo
"Failed to meet cursor update expectations in %d out of %d iterations\n",
fail_count, nloops);
+ /* Clean-up */
+ igt_plane_set_fb(igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ igt_plane_set_fb(cursor, NULL);
+ igt_output_set_pipe(output, PIPE_NONE);
+ igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+
igt_remove_fb(display->drm_fd, &fb_info);
igt_remove_fb(display->drm_fd, &cursor_fb);
munmap((void *)shared, PAGE_SIZE);
@@ -1171,6 +1221,7 @@ static void two_screens_cursor_vs_flip(igt_display_t *display, int nloops, bool
find_connected_pipe(display, true)
};
igt_output_t *outputs[2];
+ igt_plane_t *cursors[2];
shared = mmap(NULL, PAGE_SIZE, PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
igt_assert(shared != MAP_FAILED);
@@ -1190,11 +1241,11 @@ static void two_screens_cursor_vs_flip(igt_display_t *display, int nloops, bool
igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
- set_cursor_on_pipe(display, pipe[0], &cursor_fb);
+ cursors[0] = set_cursor_on_pipe(display, pipe[0], &cursor_fb);
populate_cursor_args(display, pipe[0], arg[0], &cursor_fb);
arg[0][1].x = arg[0][1].y = 192;
- set_cursor_on_pipe(display, pipe[1], &cursor_fb);
+ cursors[1] = set_cursor_on_pipe(display, pipe[1], &cursor_fb);
populate_cursor_args(display, pipe[1], arg[1], &cursor_fb);
arg[1][1].x = arg[1][1].y = 192;
@@ -1263,6 +1314,17 @@ static void two_screens_cursor_vs_flip(igt_display_t *display, int nloops, bool
vrefresh[child]*target[child], vrefresh[child]*target[child] / 2);
}
+ /* Clean-up */
+ igt_plane_set_fb(igt_output_get_plane_type(outputs[0], DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ igt_plane_set_fb(igt_output_get_plane_type(outputs[1], DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ igt_plane_set_fb(cursors[0], NULL);
+ igt_plane_set_fb(cursors[1], NULL);
+ igt_output_set_pipe(outputs[0], PIPE_NONE);
+ igt_output_set_pipe(outputs[1], PIPE_NONE);
+ igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+
igt_remove_fb(display->drm_fd, &fb_info[0]);
igt_remove_fb(display->drm_fd, &fb_info[1]);
igt_remove_fb(display->drm_fd, &cursor_fb);
@@ -1277,11 +1339,13 @@ static void flip_vs_cursor_crc(igt_display_t *display, bool atomic)
unsigned vblank_start;
enum pipe pipe = find_connected_pipe(display, false);
igt_crc_t crcs[3];
+ igt_output_t *output;
+ igt_plane_t *cursor;
if (atomic)
igt_require(display->is_atomic);
- igt_require(set_fb_on_crtc(display, pipe, &fb_info));
+ igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
populate_cursor_args(display, pipe, arg, &cursor_fb);
@@ -1290,7 +1354,7 @@ static void flip_vs_cursor_crc(igt_display_t *display, bool atomic)
pipe_crc = igt_pipe_crc_new(display->drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
- set_cursor_on_pipe(display, pipe, &cursor_fb);
+ cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
igt_display_commit2(display, COMMIT_UNIVERSAL);
/* Collect reference crcs, crcs[0] last. */
@@ -1320,6 +1384,13 @@ static void flip_vs_cursor_crc(igt_display_t *display, bool atomic)
igt_assert_crc_equal(&crcs[i], &crcs[2]);
}
+ /* Clean-up */
+ igt_plane_set_fb(igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY),
+ NULL);
+ igt_plane_set_fb(cursor, NULL);
+ igt_output_set_pipe(output, PIPE_NONE);
+ igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+
igt_remove_fb(display->drm_fd, &fb_info);
igt_remove_fb(display->drm_fd, &cursor_fb);
}
@@ -1335,6 +1406,8 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
igt_plane_t *plane_primary = igt_pipe_get_plane_type(pipe_connected, DRM_PLANE_TYPE_PRIMARY);
igt_crc_t crcs[2], test_crc;
uint64_t ahnd;
+ igt_output_t *output;
+ igt_plane_t *cursor;
igt_require_intel(display->drm_fd);
ahnd = get_reloc_ahnd(display->drm_fd, 0);
@@ -1342,7 +1415,7 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
if (atomic)
igt_require(display->is_atomic);
- igt_require(set_fb_on_crtc(display, pipe, &fb_info[0]));
+ igt_require((output = set_fb_on_crtc(display, pipe, &fb_info[0])));
igt_create_color_pattern_fb(display->drm_fd, fb_info[0].width, fb_info[0].height,
DRM_FORMAT_XRGB8888, I915_FORMAT_MOD_X_TILED, .1, .1, .1, &fb_info[1]);
@@ -1353,7 +1426,7 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
pipe_crc = igt_pipe_crc_new(display->drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
- set_cursor_on_pipe(display, pipe, &cursor_fb);
+ cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
igt_display_commit2(display, COMMIT_UNIVERSAL);
/* Collect reference crcs, crc[0] last for the loop. */
@@ -1411,6 +1484,12 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
igt_assert_crc_equal(&crcs[i], &test_crc);
}
+ /* Clean-up */
+ igt_plane_set_fb(plane_primary, NULL);
+ igt_plane_set_fb(cursor, NULL);
+ igt_output_set_pipe(output, PIPE_NONE);
+ igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+
igt_pipe_crc_stop(pipe_crc);
igt_remove_fb(display->drm_fd, &fb_info[1]);
igt_remove_fb(display->drm_fd, &fb_info[0]);
@@ -1483,6 +1562,9 @@ igt_main
igt_describe("Test checks how many cursor updates we can fit between vblanks "
"on all pipes with different modes, priority and number of processes");
igt_subtest_group {
+ igt_fixture
+ igt_display_require_output(&display);
+
igt_subtest("nonblocking-modeset-vs-cursor-atomic")
nonblocking_modeset_vs_cursor(&display, 1);
@@ -1507,6 +1589,9 @@ igt_main
{ "2x-long-nonblocking-modeset-vs-cursor-atomic", 15, true, true },
};
+ igt_fixture
+ igt_display_require_output(&display);
+
for (i = 0; i < ARRAY_SIZE(tests); i++) {
igt_subtest(tests[i].name)
two_screens_flip_vs_cursor(&display,
@@ -1530,6 +1615,9 @@ igt_main
{ "2x-long-cursor-vs-flip-atomic", 50, true },
};
+ igt_fixture
+ igt_display_require_output(&display);
+
for (i = 0; i < ARRAY_SIZE(tests); i++) {
igt_subtest(tests[i].name)
two_screens_cursor_vs_flip(&display,
@@ -1540,8 +1628,10 @@ igt_main
igt_describe("Test will first does a page flip and then cursor update");
igt_subtest_group {
- igt_fixture
+ igt_fixture {
igt_require_pipe_crc(display.drm_fd);
+ igt_display_require_output(&display);
+ }
igt_subtest("flip-vs-cursor-crc-legacy")
flip_vs_cursor_crc(&display, false);
@@ -1552,8 +1642,10 @@ igt_main
igt_describe("this test perform a busy bo update followed by a cursor update");
igt_subtest_group {
- igt_fixture
+ igt_fixture {
igt_require_pipe_crc(display.drm_fd);
+ igt_display_require_output(&display);
+ }
igt_subtest("flip-vs-cursor-busy-crc-legacy")
flip_vs_cursor_busy_crc(&display, false);
@@ -1571,6 +1663,9 @@ igt_main
"and full screen primary plane.\n"
"* toggle: which toggles cursor visibility and make sure cursor moves between updates.");
igt_subtest_group {
+ igt_fixture
+ igt_display_require_output(&display);
+
igt_subtest_with_dynamic_f("%s-flip-before-cursor", prefix[i]) {
for (j = 0; j <= flip_test_last; j++) {
igt_dynamic_f("%s", modes[j])
@@ -1600,6 +1695,9 @@ igt_main
igt_describe("The essence of the basic test is that neither the cursor nor the "
"nonblocking flip stall the application of the next");
igt_subtest_group {
+ igt_fixture
+ igt_display_require_output(&display);
+
igt_subtest_with_dynamic("flip-vs-cursor") {
for (i = 0; i <= flip_test_last; i++) {
igt_dynamic_f("%s", modes[i])
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] [i-g-t 3/3] tests/intel-ci: Rename kms_cursor_legacy subtests in BAT
2022-06-10 7:14 [igt-dev] [i-g-t 0/3] tests/kms_pipe_crc_basic: IGT test cleanup Bhanuprakash Modem
2022-06-10 7:14 ` [igt-dev] [i-g-t 1/3] tests/kms_cursor_legacy: Convert tests to dynamic Bhanuprakash Modem
2022-06-10 7:14 ` [igt-dev] [i-g-t 2/3] tests/kms_cursor_legacy: Test Cleanup Bhanuprakash Modem
@ 2022-06-10 7:14 ` Bhanuprakash Modem
2022-06-10 12:19 ` [igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_pipe_crc_basic: IGT test cleanup (rev2) Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Bhanuprakash Modem @ 2022-06-10 7:14 UTC (permalink / raw)
To: igt-dev, swati2.sharma
As we converted the subtests to dynamic, we must rename the
same subtests in BAT.
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
tests/intel-ci/fast-feedback.testlist | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index 14cad7c0..9c4d3295 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -98,14 +98,9 @@ igt@kms_chamelium@hdmi-crc-fast
igt@kms_chamelium@vga-hpd-fast
igt@kms_chamelium@vga-edid-read
igt@kms_prop_blob@basic
-igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic
-igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy
-igt@kms_cursor_legacy@basic-flip-after-cursor-atomic
-igt@kms_cursor_legacy@basic-flip-after-cursor-legacy
-igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size
-igt@kms_cursor_legacy@basic-flip-before-cursor-atomic
-igt@kms_cursor_legacy@basic-flip-before-cursor-legacy
-igt@kms_cursor_legacy@basic-flip-before-cursor-varying-size
+igt@kms_cursor_legacy@basic-busy-flip-before-cursor
+igt@kms_cursor_legacy@basic-flip-after-cursor
+igt@kms_cursor_legacy@basic-flip-before-cursor
igt@kms_flip@basic-flip-vs-dpms
igt@kms_flip@basic-flip-vs-modeset
igt@kms_flip@basic-flip-vs-wf_vblank
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_pipe_crc_basic: IGT test cleanup (rev2)
2022-06-10 7:14 [igt-dev] [i-g-t 0/3] tests/kms_pipe_crc_basic: IGT test cleanup Bhanuprakash Modem
` (2 preceding siblings ...)
2022-06-10 7:14 ` [igt-dev] [i-g-t 3/3] tests/intel-ci: Rename kms_cursor_legacy subtests in BAT Bhanuprakash Modem
@ 2022-06-10 12:19 ` Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2022-06-10 12:19 UTC (permalink / raw)
To: Bhanuprakash Modem; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 19535 bytes --]
== Series Details ==
Series: tests/kms_pipe_crc_basic: IGT test cleanup (rev2)
URL : https://patchwork.freedesktop.org/series/104916/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11751 -> IGTPW_7274
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_7274 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_7274, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/index.html
Participating hosts (41 -> 42)
------------------------------
Additional (2): fi-kbl-soraka bat-dg1-5
Missing (1): fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_7274:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_rpm@module-reload:
- fi-bsw-n3050: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11751/fi-bsw-n3050/igt@i915_pm_rpm@module-reload.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-bsw-n3050/igt@i915_pm_rpm@module-reload.html
* {igt@kms_cursor_legacy@basic-flip-before-cursor} (NEW):
- bat-dg1-5: NOTRUN -> [SKIP][3] +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@kms_cursor_legacy@basic-flip-before-cursor.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- {fi-ehl-2}: NOTRUN -> [SKIP][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-ehl-2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
New tests
---------
New tests have been introduced between CI_DRM_11751 and IGTPW_7274:
### New IGT tests (7) ###
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic:
- Statuses : 8 pass(s) 3 skip(s)
- Exec time: [0.00, 2.26] s
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions:
- Statuses : 8 pass(s) 3 skip(s)
- Exec time: [0.0, 2.40] s
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size:
- Statuses : 8 pass(s) 3 skip(s)
- Exec time: [0.0, 2.24] s
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@legacy:
- Statuses : 11 pass(s)
- Exec time: [0.93, 1.45] s
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@toggle:
- Statuses : 11 pass(s)
- Exec time: [0.94, 2.19] s
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@varying-size:
- Statuses : 11 pass(s)
- Exec time: [0.94, 2.20] s
* igt@kms_cursor_legacy@basic-flip-before-cursor:
- Statuses : 7 skip(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in IGTPW_7274 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@fbdev@nullptr:
- bat-dg1-5: NOTRUN -> [SKIP][5] ([i915#2582]) +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@fbdev@nullptr.html
* igt@gem_exec_gttfill@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][6] ([fdo#109271]) +8 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-kbl-soraka/igt@gem_exec_gttfill@basic.html
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#2190])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#4613]) +3 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-kbl-soraka/igt@gem_lmem_swapping@basic.html
* igt@gem_mmap@basic:
- bat-dg1-5: NOTRUN -> [SKIP][9] ([i915#4083])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@gem_mmap@basic.html
* igt@gem_tiled_blits@basic:
- bat-dg1-5: NOTRUN -> [SKIP][10] ([i915#4077]) +2 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@gem_tiled_blits@basic.html
* igt@gem_tiled_pread_basic:
- bat-dg1-5: NOTRUN -> [SKIP][11] ([i915#4079]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- bat-dg1-5: NOTRUN -> [SKIP][12] ([i915#1155])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@i915_pm_backlight@basic-brightness.html
* igt@i915_pm_rpm@module-reload:
- bat-adlp-4: [PASS][13] -> [DMESG-WARN][14] ([i915#3576]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11751/bat-adlp-4/igt@i915_pm_rpm@module-reload.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-adlp-4/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][15] ([i915#1886])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@hangcheck:
- bat-dg1-5: NOTRUN -> [DMESG-FAIL][16] ([i915#4494] / [i915#4957])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@i915_selftest@live@hangcheck.html
* igt@i915_suspend@basic-s2idle-without-i915:
- bat-dg1-6: NOTRUN -> [INCOMPLETE][17] ([i915#6011])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-6/igt@i915_suspend@basic-s2idle-without-i915.html
- bat-dg1-5: NOTRUN -> [INCOMPLETE][18] ([i915#6011])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@i915_suspend@basic-s2idle-without-i915.html
* igt@kms_addfb_basic@basic-x-tiled-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][19] ([i915#4212]) +7 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@kms_addfb_basic@basic-x-tiled-legacy.html
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][20] ([i915#4215])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@kms_addfb_basic@basic-y-tiled-legacy.html
* igt@kms_busy@basic:
- bat-dg1-5: NOTRUN -> [SKIP][21] ([i915#1845] / [i915#4303])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@kms_busy@basic.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-snb-2600: NOTRUN -> [SKIP][22] ([fdo#109271] / [fdo#111827])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-snb-2600/igt@kms_chamelium@common-hpd-after-suspend.html
* igt@kms_chamelium@dp-crc-fast:
- bat-dg1-5: NOTRUN -> [SKIP][23] ([fdo#111827]) +7 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@kms_chamelium@dp-crc-fast.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-soraka: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111827]) +7 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-kbl-soraka/igt@kms_chamelium@hdmi-hpd-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-cfl-8700k: NOTRUN -> [SKIP][25] ([fdo#109271])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-cfl-8700k/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-bsw-nick: NOTRUN -> [SKIP][26] ([fdo#109271]) +2 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-bsw-nick/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-glk-dsi: NOTRUN -> [SKIP][27] ([fdo#109271])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-glk-dsi/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- bat-adlp-4: NOTRUN -> [SKIP][28] ([i915#4103])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-adlp-4/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-kbl-guc: NOTRUN -> [SKIP][29] ([fdo#109271]) +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-kbl-guc/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-glk-j4005: NOTRUN -> [SKIP][30] ([fdo#109271])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-glk-j4005/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-skl-6700k2: NOTRUN -> [SKIP][31] ([fdo#109271])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-skl-6700k2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-rkl-11600: NOTRUN -> [SKIP][32] ([i915#4103])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-rkl-11600/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-tgl-1115g4: NOTRUN -> [SKIP][33] ([i915#4103])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-tgl-1115g4/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-adl-ddr5: NOTRUN -> [SKIP][34] ([i915#4103])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-adl-ddr5/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-cfl-guc: NOTRUN -> [SKIP][35] ([fdo#109271])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-cfl-guc/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-cfl-8109u: NOTRUN -> [SKIP][36] ([fdo#109271])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-cfl-8109u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-skl-6600u: NOTRUN -> [SKIP][37] ([fdo#109271])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-skl-6600u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-rkl-guc: NOTRUN -> [SKIP][38] ([i915#4103])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-rkl-guc/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- fi-skl-guc: NOTRUN -> [SKIP][39] ([fdo#109271])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-skl-guc/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
- bat-dg1-6: NOTRUN -> [SKIP][40] ([i915#4103])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-6/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
* {igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size} (NEW):
- fi-blb-e6850: NOTRUN -> [SKIP][41] ([fdo#109271]) +8 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-blb-e6850/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@basic-flip-after-cursor:
- fi-kbl-8809g: NOTRUN -> [SKIP][42] ([fdo#109271]) +2 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-kbl-8809g/igt@kms_cursor_legacy@basic-flip-after-cursor.html
- fi-bdw-gvtdvm: NOTRUN -> [SKIP][43] ([fdo#109271]) +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-bdw-gvtdvm/igt@kms_cursor_legacy@basic-flip-after-cursor.html
* {igt@kms_cursor_legacy@basic-flip-before-cursor} (NEW):
- fi-kbl-7567u: NOTRUN -> [SKIP][44] ([fdo#109271]) +2 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-kbl-7567u/igt@kms_cursor_legacy@basic-flip-before-cursor.html
- {bat-dg2-8}: NOTRUN -> [SKIP][45] ([i915#5354])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg2-8/igt@kms_cursor_legacy@basic-flip-before-cursor.html
* igt@kms_cursor_legacy@basic-flip-before-cursor@atomic:
- fi-pnv-d510: NOTRUN -> [SKIP][46] ([fdo#109271]) +8 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-pnv-d510/igt@kms_cursor_legacy@basic-flip-before-cursor@atomic.html
* igt@kms_cursor_legacy@basic-flip-before-cursor@atomic-transitions-varying-size:
- fi-elk-e7500: NOTRUN -> [SKIP][47] ([fdo#109271]) +8 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-elk-e7500/igt@kms_cursor_legacy@basic-flip-before-cursor@atomic-transitions-varying-size.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-dg1-5: NOTRUN -> [SKIP][48] ([fdo#109285])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-kbl-soraka: NOTRUN -> [SKIP][49] ([fdo#109271] / [i915#533])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-kbl-soraka/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
- bat-dg1-5: NOTRUN -> [SKIP][50] ([i915#4078]) +15 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a.html
* igt@kms_psr@primary_page_flip:
- bat-dg1-5: NOTRUN -> [SKIP][51] ([i915#1072] / [i915#4078]) +3 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@kms_psr@primary_page_flip.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-dg1-5: NOTRUN -> [SKIP][52] ([i915#3555])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-fence-flip:
- bat-dg1-5: NOTRUN -> [SKIP][53] ([i915#1845] / [i915#3708])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-fence-read:
- bat-dg1-5: NOTRUN -> [SKIP][54] ([i915#3708]) +2 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@prime_vgem@basic-fence-read.html
* igt@prime_vgem@basic-gtt:
- bat-dg1-5: NOTRUN -> [SKIP][55] ([i915#3708] / [i915#4077]) +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@prime_vgem@basic-gtt.html
* igt@prime_vgem@basic-userptr:
- bat-dg1-5: NOTRUN -> [SKIP][56] ([i915#3708] / [i915#4873])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@prime_vgem@basic-userptr.html
* igt@runner@aborted:
- bat-dg1-5: NOTRUN -> [FAIL][57] ([i915#4312] / [i915#5257])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-5/igt@runner@aborted.html
#### Possible fixes ####
* igt@i915_selftest@live@gt_engines:
- bat-dg1-6: [INCOMPLETE][58] ([i915#4418]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11751/bat-dg1-6/igt@i915_selftest@live@gt_engines.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg1-6/igt@i915_selftest@live@gt_engines.html
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [INCOMPLETE][60] ([i915#3921]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11751/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@sanitycheck:
- {bat-dg2-9}: [DMESG-WARN][62] ([i915#5763]) -> [PASS][63] +1 similar issue
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11751/bat-dg2-9/igt@i915_selftest@live@sanitycheck.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-dg2-9/igt@i915_selftest@live@sanitycheck.html
* igt@kms_flip@basic-flip-vs-modeset@b-edp1:
- {bat-adlp-6}: [DMESG-WARN][64] ([i915#3576]) -> [PASS][65] +1 similar issue
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11751/bat-adlp-6/igt@kms_flip@basic-flip-vs-modeset@b-edp1.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-adlp-6/igt@kms_flip@basic-flip-vs-modeset@b-edp1.html
* igt@kms_flip@basic-flip-vs-wf_vblank@a-edp1:
- bat-adlp-4: [DMESG-WARN][66] ([i915#3576]) -> [PASS][67] +1 similar issue
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11751/bat-adlp-4/igt@kms_flip@basic-flip-vs-wf_vblank@a-edp1.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/bat-adlp-4/igt@kms_flip@basic-flip-vs-wf_vblank@a-edp1.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4303]: https://gitlab.freedesktop.org/drm/intel/issues/4303
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4418]: https://gitlab.freedesktop.org/drm/intel/issues/4418
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
[i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5763]: https://gitlab.freedesktop.org/drm/intel/issues/5763
[i915#5885]: https://gitlab.freedesktop.org/drm/intel/issues/5885
[i915#6011]: https://gitlab.freedesktop.org/drm/intel/issues/6011
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_6518 -> IGTPW_7274
CI-20190529: 20190529
CI_DRM_11751: a3f181e83855047cd3f93f21beeee04caf942794 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_7274: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/index.html
IGT_6518: 0189ca288f7188e60f5eda356b190040bf8ec704 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Testlist changes
----------------
+++ 18 lines
--- 96 lines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_7274/index.html
[-- Attachment #2: Type: text/html, Size: 24034 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] [i-g-t 1/3] tests/kms_cursor_legacy: Convert tests to dynamic
2022-06-10 9:09 [igt-dev] [i-g-t 0/3] tests/kms_cursor_legacy: IGT test cleanup Bhanuprakash Modem
@ 2022-06-10 9:09 ` Bhanuprakash Modem
0 siblings, 0 replies; 6+ messages in thread
From: Bhanuprakash Modem @ 2022-06-10 9:09 UTC (permalink / raw)
To: igt-dev, swati2.sharma
Convert the existing subtests to dynamic subtests.
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
tests/kms_cursor_legacy.c | 259 +++++++++++++++++++++-----------------
1 file changed, 141 insertions(+), 118 deletions(-)
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
index 47b9b4e1..8f5e5fd2 100644
--- a/tests/kms_cursor_legacy.c
+++ b/tests/kms_cursor_legacy.c
@@ -1424,6 +1424,15 @@ igt_main
igt_display_t display = { .drm_fd = -1 };
bool intel_psr2_restore = false;
int i;
+ const char *modes[flip_test_last+1] = {
+ "legacy",
+ "varying-size",
+ "toggle",
+ "atomic",
+ "atomic-transitions",
+ "atomic-transitions-varying-size"
+ };
+ const char *prefix[2] = {"basic", "short"};
igt_fixture {
display.drm_fd = drm_open_driver_master(DRIVER_ANY);
@@ -1438,55 +1447,42 @@ igt_main
intel_psr2_restore = i915_psr2_sel_fetch_to_psr1(display.drm_fd);
}
- /*Test description for pipe-* and all-pipe-* tests*/
igt_describe("Test checks how many cursor updates we can fit between vblanks "
- "on single pipe with different modes, priority and number of processes");
+ "on single/all pipes with different modes, priority and number of processes");
igt_subtest_group {
enum pipe n;
- for_each_pipe_static(n) {
- errno = 0;
-
- igt_fixture {
- igt_require_pipe(&display, n);
- }
+ struct {
+ const char *name;
+ int ncpus;
+ unsigned flags;
+ } tests[] = {
+ { "single-bo", 1, DRM_MODE_CURSOR_BO },
+ { "single-move", 1, DRM_MODE_CURSOR_MOVE },
+ { "forked-bo", ncpus, DRM_MODE_CURSOR_BO },
+ { "forked-move", ncpus, DRM_MODE_CURSOR_MOVE },
+ { "torture-bo", -ncpus, DRM_MODE_CURSOR_BO },
+ { "torture-move", -ncpus, DRM_MODE_CURSOR_MOVE },
+ };
- igt_subtest_f("pipe-%s-single-bo", kmstest_pipe_name(n))
- stress(&display, n, 1, DRM_MODE_CURSOR_BO, 20);
- igt_subtest_f("pipe-%s-single-move", kmstest_pipe_name(n))
- stress(&display, n, 1, DRM_MODE_CURSOR_MOVE, 20);
+ for (i = 0; i < ARRAY_SIZE(tests); i++) {
+ igt_subtest_with_dynamic(tests[i].name) {
+ for_each_pipe(&display, n) {
+ errno = 0;
- igt_subtest_f("pipe-%s-forked-bo", kmstest_pipe_name(n))
- stress(&display, n, ncpus, DRM_MODE_CURSOR_BO, 20);
- igt_subtest_f("pipe-%s-forked-move", kmstest_pipe_name(n))
- stress(&display, n, ncpus, DRM_MODE_CURSOR_MOVE, 20);
+ igt_dynamic_f("pipe-%s", kmstest_pipe_name(n))
+ stress(&display, n, tests[i].ncpus, tests[i].flags, 20);
+ }
- igt_subtest_f("pipe-%s-torture-bo", kmstest_pipe_name(n))
- stress(&display, n, -ncpus, DRM_MODE_CURSOR_BO, 20);
- igt_subtest_f("pipe-%s-torture-move", kmstest_pipe_name(n))
- stress(&display, n, -ncpus, DRM_MODE_CURSOR_MOVE, 20);
+ errno = 0;
+ igt_dynamic("all-pipes")
+ stress(&display, -1, tests[i].ncpus, tests[i].flags, 20);
+ }
}
}
- /*Test description for pipe-* and all-pipe-* tests*/
igt_describe("Test checks how many cursor updates we can fit between vblanks "
"on all pipes with different modes, priority and number of processes");
igt_subtest_group {
-
- igt_subtest("all-pipes-single-bo")
- stress(&display, -1, 1, DRM_MODE_CURSOR_BO, 20);
- igt_subtest("all-pipes-single-move")
- stress(&display, -1, 1, DRM_MODE_CURSOR_MOVE, 20);
-
- igt_subtest("all-pipes-forked-bo")
- stress(&display, -1, ncpus, DRM_MODE_CURSOR_BO, 20);
- igt_subtest("all-pipes-forked-move")
- stress(&display, -1, ncpus, DRM_MODE_CURSOR_MOVE, 20);
-
- igt_subtest("all-pipes-torture-bo")
- stress(&display, -1, -ncpus, DRM_MODE_CURSOR_BO, 20);
- igt_subtest("all-pipes-torture-move")
- stress(&display, -1, -ncpus, DRM_MODE_CURSOR_MOVE, 20);
-
igt_subtest("nonblocking-modeset-vs-cursor-atomic")
nonblocking_modeset_vs_cursor(&display, 1);
@@ -1494,43 +1490,54 @@ igt_main
nonblocking_modeset_vs_cursor(&display, 16);
}
- /*Test Description for 2x-* tests*/
igt_describe("This test executes flips on both CRTCs "
"while running cursor updates in parallel");
igt_subtest_group {
+ struct {
+ const char *name;
+ int nloops;
+ bool modeset;
+ bool atomic;
+ } tests[] = {
+ { "2x-flip-vs-cursor-legacy", 8, false, false },
+ { "2x-flip-vs-cursor-atomic", 8, false, true },
+ { "2x-long-flip-vs-cursor-legacy", 150, false, false },
+ { "2x-long-flip-vs-cursor-atomic", 150, false, true },
+ { "2x-nonblocking-modeset-vs-cursor-atomic", 4, true, true },
+ { "2x-long-nonblocking-modeset-vs-cursor-atomic", 15, true, true },
+ };
- igt_subtest("2x-flip-vs-cursor-legacy")
- two_screens_flip_vs_cursor(&display, 8, false, false);
-
- igt_subtest("2x-flip-vs-cursor-atomic")
- two_screens_flip_vs_cursor(&display, 8, false, true);
-
- igt_subtest("2x-cursor-vs-flip-legacy")
- two_screens_cursor_vs_flip(&display, 8, false);
-
- igt_subtest("2x-long-flip-vs-cursor-legacy")
- two_screens_flip_vs_cursor(&display, 150, false, false);
-
- igt_subtest("2x-long-flip-vs-cursor-atomic")
- two_screens_flip_vs_cursor(&display, 150, false, true);
-
- igt_subtest("2x-long-cursor-vs-flip-legacy")
- two_screens_cursor_vs_flip(&display, 50, false);
-
- igt_subtest("2x-nonblocking-modeset-vs-cursor-atomic")
- two_screens_flip_vs_cursor(&display, 4, true, true);
-
- igt_subtest("2x-cursor-vs-flip-atomic")
- two_screens_cursor_vs_flip(&display, 8, true);
+ for (i = 0; i < ARRAY_SIZE(tests); i++) {
+ igt_subtest(tests[i].name)
+ two_screens_flip_vs_cursor(&display,
+ tests[i].nloops,
+ tests[i].modeset,
+ tests[i].atomic);
+ }
+ }
- igt_subtest("2x-long-nonblocking-modeset-vs-cursor-atomic")
- two_screens_flip_vs_cursor(&display, 15, true, true);
+ igt_describe("This test executes flips on both CRTCs "
+ "while running cursor updates in parallel");
+ igt_subtest_group {
+ struct {
+ const char *name;
+ int nloops;
+ bool atomic;
+ } tests[] = {
+ { "2x-cursor-vs-flip-legacy", 8, false },
+ { "2x-long-cursor-vs-flip-legacy", 50, false },
+ { "2x-cursor-vs-flip-atomic", 8, true },
+ { "2x-long-cursor-vs-flip-atomic", 50, true },
+ };
- igt_subtest("2x-long-cursor-vs-flip-atomic")
- two_screens_cursor_vs_flip(&display, 50, true);
+ for (i = 0; i < ARRAY_SIZE(tests); i++) {
+ igt_subtest(tests[i].name)
+ two_screens_cursor_vs_flip(&display,
+ tests[i].nloops,
+ tests[i].atomic);
+ }
}
- /*Test description for cursor-crc tests*/
igt_describe("Test will first does a page flip and then cursor update");
igt_subtest_group {
igt_fixture
@@ -1543,7 +1550,6 @@ igt_main
flip_vs_cursor_crc(&display, true);
}
- /*Test description for busy-crc tests*/
igt_describe("this test perform a busy bo update followed by a cursor update");
igt_subtest_group {
igt_fixture
@@ -1556,69 +1562,86 @@ igt_main
flip_vs_cursor_busy_crc(&display, true);
}
- for (i = 0; i <= flip_test_last; i++) {
- const char *modes[flip_test_last+1] = {
- "legacy",
- "varying-size",
- "toggle",
- "atomic",
- "atomic-transitions",
- "atomic-transitions-varying-size"
- };
- const char *prefix = "short-";
+ for (i = 0; i < ARRAY_SIZE(prefix); i++) {
+ int j;
- switch (i) {
- case flip_test_legacy:
- case flip_test_varying_size:
- case flip_test_atomic:
- prefix = "basic-";
- break;
- default: break;
- }
+ igt_describe("Adds variety of tests:\n"
+ "* varying-size: change the size of cursor b/w 64*64 to maxw x maxh.\n"
+ "* atomic-transition: alternates between a full screen sprite plane "
+ "and full screen primary plane.\n"
+ "* toggle: which toggles cursor visibility and make sure cursor moves between updates.");
+ igt_subtest_group {
+ igt_subtest_with_dynamic_f("%s-flip-before-cursor", prefix[i]) {
+ for (j = 0; j <= flip_test_last; j++) {
+ igt_dynamic_f("%s", modes[j])
+ basic_flip_cursor(&display, j, FLIP_BEFORE_CURSOR, 0);
+ }
+ }
- igt_describe("Adds variety of tests: "
- "varying-size: change the size of cursor b/w 64*64 to maxw x maxh. "
- "atomic-transition: alternates between a full screen sprite plane. "
- "and full screen primary plane. "
- "toggle: which toggles cursor visibility and make sure cursor moves between updates.");
- igt_subtest_group {
- igt_subtest_f("%sflip-before-cursor-%s", prefix, modes[i])
- basic_flip_cursor(&display, i, FLIP_BEFORE_CURSOR, 0);
-
- igt_subtest_f("%sbusy-flip-before-cursor-%s", prefix, modes[i]) {
- igt_require(!cursor_slowpath(&display, i));
- igt_require_gem(display.drm_fd);
- basic_flip_cursor(&display, i, FLIP_BEFORE_CURSOR,
- BASIC_BUSY);
- }
- }
+ igt_subtest_with_dynamic_f("%s-busy-flip-before-cursor", prefix[i]) {
+ igt_require(!cursor_slowpath(&display, i));
+ igt_require_gem(display.drm_fd);
- igt_describe("The essence of the basic test is that neither the cursor nor the "
- "nonblocking flip stall the application of the next");
- igt_subtest_group {
+ for (j = 0; j <= flip_test_last; j++) {
+ igt_dynamic_f("%s", modes[j])
+ basic_flip_cursor(&display, j, FLIP_BEFORE_CURSOR, BASIC_BUSY);
+ }
+ }
- igt_subtest_f("%sflip-after-cursor-%s", prefix, modes[i])
- basic_flip_cursor(&display, i, FLIP_AFTER_CURSOR, 0);
+ igt_subtest_with_dynamic_f("%s-flip-after-cursor", prefix[i]) {
+ for (j = 0; j <= flip_test_last; j++) {
+ igt_dynamic_f("%s", modes[j])
+ basic_flip_cursor(&display, j, FLIP_AFTER_CURSOR, 0);
+ }
+ }
+ }
+ }
- igt_subtest_f("flip-vs-cursor-%s", modes[i])
- flip_vs_cursor(&display, i, 150);
+ igt_describe("The essence of the basic test is that neither the cursor nor the "
+ "nonblocking flip stall the application of the next");
+ igt_subtest_group {
+ igt_subtest_with_dynamic("flip-vs-cursor") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip_vs_cursor(&display, i, 150);
+ }
+ }
- igt_subtest_f("cursor-vs-flip-%s", modes[i])
- cursor_vs_flip(&display, i, 50);
+ igt_subtest_with_dynamic("cursor-vs-flip") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ cursor_vs_flip(&display, i, 50);
+ }
+ }
- igt_subtest_f("cursorA-vs-flipA-%s", modes[i])
- flip(&display, 0, 0, 10, i);
+ igt_subtest_with_dynamic("cursorA-vs-flipA") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip(&display, 0, 0, 10, i);
+ }
+ }
- igt_subtest_f("cursorA-vs-flipB-%s", modes[i])
- flip(&display, 0, 1, 10, i);
+ igt_subtest_with_dynamic("cursorA-vs-flipB") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip(&display, 0, 1, 10, i);
+ }
+ }
- igt_subtest_f("cursorB-vs-flipA-%s", modes[i])
- flip(&display, 1, 0, 10, i);
+ igt_subtest_with_dynamic("cursorB-vs-flipA") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip(&display, 1, 0, 10, i);
+ }
+ }
- igt_subtest_f("cursorB-vs-flipB-%s", modes[i])
- flip(&display, 1, 1, 10, i);
+ igt_subtest_with_dynamic("cursorB-vs-flipB") {
+ for (i = 0; i <= flip_test_last; i++) {
+ igt_dynamic_f("%s", modes[i])
+ flip(&display, 1, 1, 10, i);
}
}
+ }
igt_fixture {
if (intel_psr2_restore)
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-06-10 12:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-10 7:14 [igt-dev] [i-g-t 0/3] tests/kms_pipe_crc_basic: IGT test cleanup Bhanuprakash Modem
2022-06-10 7:14 ` [igt-dev] [i-g-t 1/3] tests/kms_cursor_legacy: Convert tests to dynamic Bhanuprakash Modem
2022-06-10 7:14 ` [igt-dev] [i-g-t 2/3] tests/kms_cursor_legacy: Test Cleanup Bhanuprakash Modem
2022-06-10 7:14 ` [igt-dev] [i-g-t 3/3] tests/intel-ci: Rename kms_cursor_legacy subtests in BAT Bhanuprakash Modem
2022-06-10 12:19 ` [igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_pipe_crc_basic: IGT test cleanup (rev2) Patchwork
2022-06-10 9:09 [igt-dev] [i-g-t 0/3] tests/kms_cursor_legacy: IGT test cleanup Bhanuprakash Modem
2022-06-10 9:09 ` [igt-dev] [i-g-t 1/3] tests/kms_cursor_legacy: Convert tests to dynamic Bhanuprakash Modem
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.