[igt-dev] [PATCH i-g-t v3 2/2] tests/kms_universal_plane: Convert test to dynamic.

[Ananya Sharma]

Modified kms_universal_plane to include dynamic test cases.

Signed-off-by: Ananya Sharma <ananya.sharma at intel.com>
---
 tests/kms_universal_plane.c | 84 ++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 47 deletions(-)

diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index 68807183..1b896cff 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -135,8 +135,6 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 	int num_primary = 0, num_cursor = 0;
 	int i;
 
-	igt_display_reset(display);
-
 	igt_info("Testing connector %s using pipe %s\n", igt_output_name(output),
 		 kmstest_pipe_name(pipe));
 
@@ -364,8 +362,6 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 	int i;
 	int expect;
 
-	igt_display_reset(&data->display);
-
 	igt_output_set_pipe(output, pipe);
 	mode = igt_output_get_mode(output);
 
@@ -477,8 +473,6 @@ pageflip_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 	fd_set fds;
 	int ret = 0;
 
-	igt_display_reset(&data->display);
-
 	igt_output_set_pipe(output, pipe);
 
 	pageflip_test_init(&test, output, pipe);
@@ -578,9 +572,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 	int r, g, b;
 	int count1, count2;
 
-	igt_display_reset(display);
 	igt_require(display->has_cursor_plane);
-	igt_require_intel(data->drm_fd);
 
 	igt_output_set_pipe(output, pipe);
 	mode = igt_output_get_mode(output);
@@ -706,8 +698,6 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 
 	int ret = 0;
 
-	igt_display_reset(&data->display);
-	igt_require_intel(data->drm_fd);
 	igt_skip_on(data->display_ver < 9);
 
 	igt_output_set_pipe(output, pipe);
@@ -746,48 +736,50 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 }
 
 static void
-run_tests_for_pipe(data_t *data, enum pipe pipe)
+run_tests_for_pipe(data_t *data)
 {
 	igt_output_t *output;
+        struct {
+                const char *name;
+                void(*test_t)(data_t*, enum pipe, igt_output_t*);
+                const char *desc;
+        } tests[] = {
+                { "universal-plane-functional", functional_test_pipe,
+                  "Check the switching between different primary plane fbs with CRTC off" },
+
+                { "universal-plane-sanity", sanity_test_pipe,
+                  "Test for scale-up or scale-down using universal plane API without covering CRTC" },
+
+                { "disable-primary-vs-flip", pageflip_test_pipe,
+                  "Check pageflips while primary plane is disabled before IOCTL or between IOCTL"
+                  "and pageflip execution" },
 
-	igt_describe("Check the switching between different primary plane fbs with CRTC off");
-	igt_subtest_f("universal-plane-pipe-%s-functional",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			functional_test_pipe(data, pipe, output);
-
-	igt_describe("Test for scale-up or scale-down using universal plane API without covering CRTC");
-	igt_subtest_f("universal-plane-pipe-%s-sanity",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			sanity_test_pipe(data, pipe, output);
-
-	igt_describe("Check pageflips while primary plane is disabled before IOCTL or between IOCTL"
-			" and pageflip execution");
-	igt_subtest_f("disable-primary-vs-flip-pipe-%s",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			pageflip_test_pipe(data, pipe, output);
-
-	igt_describe("Check for cursor leaks after performing cursor operations");
-	igt_subtest_f("cursor-fb-leak-pipe-%s",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			cursor_leak_test_pipe(data, pipe, output);
-
-	igt_describe("Check if pageflip succeeds in windowed setting");
-	igt_subtest_f("universal-plane-gen9-features-pipe-%s",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			gen9_test_pipe(data, pipe, output);
+                { "cursor-fb-leak", cursor_leak_test_pipe,
+                  "Check for cursor leaks after performing cursor operations" },
+
+		{ "universal-plane-gen9-features", gen9_test_pipe,
+		  "Check if pageflip succeeds in windowed setting"},
+        };
+
+	int i;
+	enum pipe pipe;
+	        for (i = 0; i < ARRAY_SIZE(tests); i++) {
+                igt_describe_f("%s", tests[i].desc);
+                igt_subtest_with_dynamic(tests[i].name) {
+                        for_each_pipe_with_single_output(&data->display, pipe, output){
+				igt_display_reset(&data->display);
+				igt_require_intel(data->drm_fd);
+				igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe),igt_output_name(output))
+					tests[i].test_t(data, pipe, output);
+                        }
+                }
+        }
 }
 
 static data_t data;
 
 igt_main
 {
-	enum pipe pipe;
-
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
 		if (is_i915_device(data.drm_fd))
@@ -800,10 +792,8 @@ igt_main
 		igt_display_require_output(&data.display);
 	}
 
-	for_each_pipe_static(pipe) {
-		igt_subtest_group
-			run_tests_for_pipe(&data, pipe);
-	}
+	igt_subtest_group
+		run_tests_for_pipe(&data);
 
 	igt_fixture {
 		igt_display_fini(&data.display);
-- 
2.25.1