[igt-dev] [PATCH i-g-t] tests/kms_busy: Limit the execution to single connector

* [igt-dev] [PATCH i-g-t] tests/kms_busy: Limit the execution to single connector
@ 2021-08-10  7:23 Bhanuprakash Modem
  2021-08-10  8:30 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
  2021-08-10 11:10 ` [igt-dev] ✗ GitLab.Pipeline: warning " Patchwork
  0 siblings, 2 replies; 3+ messages in thread
From: Bhanuprakash Modem @ 2021-08-10  7:23 UTC (permalink / raw)
  To: igt-dev; +Cc: Bhanuprakash Modem, Karthik B S

As part of reducing the CI time, we restricted the execution
to two pipes (first & last), which also introduced running the
tests on all connectors.

	commit 030c28d099a5c6793c92e2b22c8e9abd3d340fdc
	tests/kms_busy: Limit the execution to two pipes

With that change in multi-display configuration, we run the test
multiple times on the same pipe with different connectors, which
increases the CI time.

This patch will fix the logic to run the tests on a single
connector only.

Cc: Karthik B S <karthik.b.s@intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/kms_busy.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/kms_busy.c b/tests/kms_busy.c
index a60ff6b05..57c11b2ca 100644
--- a/tests/kms_busy.c
+++ b/tests/kms_busy.c
@@ -348,9 +348,8 @@ igt_main_args("e", NULL, help_str, opt_handler, NULL)
 	igt_describe("Test for basic check of KMS ABI with busy framebuffers.");
 	igt_subtest_with_dynamic("basic") { /* just run on the first pipe */
 		enum pipe pipe;
-		igt_output_t *output;
 
-		for_each_pipe_with_valid_output(&display, pipe, output) {
+		for_each_pipe(&display, pipe) {
 			igt_dynamic("flip")
 				test_flip(&display, pipe, false);
 			igt_dynamic("modeset")
@@ -361,11 +360,10 @@ igt_main_args("e", NULL, help_str, opt_handler, NULL)
 
 	igt_subtest_with_dynamic("basic-hang") {
 		enum pipe pipe;
-		igt_output_t *output;
 		igt_hang_t hang = igt_allow_hang(display.drm_fd, 0, 0);
 		errno = 0;
 
-		for_each_pipe_with_valid_output(&display, pipe, output) {
+		for_each_pipe(&display, pipe) {
 			if (!all_pipes && pipe != active_pipes[0] &&
 					  pipe != active_pipes[last_pipe])
 				continue;
@@ -381,11 +379,10 @@ igt_main_args("e", NULL, help_str, opt_handler, NULL)
 
 	igt_subtest_with_dynamic("extended-pageflip-modeset-hang-oldfb") {
 		enum pipe pipe;
-		igt_output_t *output;
 		igt_hang_t hang = igt_allow_hang(display.drm_fd, 0, 0);
 		errno = 0;
 
-		for_each_pipe_with_valid_output(&display, pipe, output) {
+		for_each_pipe(&display, pipe) {
 			if (!all_pipes && pipe != active_pipes[0] &&
 					  pipe != active_pipes[last_pipe])
 				continue;
@@ -400,14 +397,13 @@ igt_main_args("e", NULL, help_str, opt_handler, NULL)
 	for (i = 0; i < sizeof(tests) / sizeof (tests[0]); i++) {
 		igt_subtest_with_dynamic(tests[i].name) {
 			enum pipe pipe;
-			igt_output_t *output;
 			igt_hang_t hang;
 			errno = 0;
 
 			igt_require(display.is_atomic);
 			hang = igt_allow_hang(display.drm_fd, 0, 0);
 
-			for_each_pipe_with_valid_output(&display, pipe, output) {
+			for_each_pipe(&display, pipe) {
 				if (!all_pipes && pipe != active_pipes[0] &&
 						  pipe != active_pipes[last_pipe])
 					continue;
-- 
2.32.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread