Skip to contentSkip to conversation

tests/kms_display_modes: Move intel_pipe_output_combo_valid before igt_output_set_pipe

PATCH In review Jeevan B 2 participants 2 messages Mar 28, 2025

lore
Share & tools
lore

Jeevan B

author
#0 lore raw

PATCH 1/1 tests/kms_display_modes: Move intel_pipe_output_combo_valid before igt_output_set_pipe

Having this check after igt_output_set_pipe causes a commit failure, so we need to check intel_pipe_output_combo_valid before setting pipe.

---
 tests/kms_display_modes.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tests/kms_display_modes.c +3 -3
index 588820170..3e388bb33 100644
@@ -199,12 +199,12 @@ static void run_extendedmode_test(data_t *data) {
 
 					igt_display_reset(display);
 
-					igt_output_set_pipe(output1, pipe1);
-					igt_output_set_pipe(output2, pipe2);
-
 					if (!intel_pipe_output_combo_valid(display))
 						continue;
 
+					igt_output_set_pipe(output1, pipe1);
+					igt_output_set_pipe(output2, pipe2);
+
 					igt_dynamic_f("pipe-%s-%s-pipe-%s-%s",
 						      kmstest_pipe_name(pipe1),
 						      igt_output_name(output1),
Signature · 1 line
2.25.1
#1 lore raw

Hi Jeevan,

Quoted 2 lines · Jeevan B

Having this check after igt_output_set_pipe causes a commit failure, so we need to check intel_pipe_output_combo_valid before setting pipe.

We need to set_pipe() first and then check intel_pipe_output_combo_valid(). W/o setting pipe, we won't know if pipe/output combo is valid or not.

Quoted 26 lines
---
  tests/kms_display_modes.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
tests/kms_display_modes.c +3 -3
index 588820170..3e388bb33 100644
@@ -199,12 +199,12 @@ static void run_extendedmode_test(data_t *data) {
 
  					igt_display_reset(display);
 
-					igt_output_set_pipe(output1, pipe1);
-					igt_output_set_pipe(output2, pipe2);
-
  					if (!intel_pipe_output_combo_valid(display))
  						continue;
 
+					igt_output_set_pipe(output1, pipe1);
+					igt_output_set_pipe(output2, pipe2);
+
  					igt_dynamic_f("pipe-%s-%s-pipe-%s-%s",
  						      kmstest_pipe_name(pipe1),
  						      igt_output_name(output1),