[igt-dev] [i-g-t] lib/igt_kms: Silent errors on invalid pipe/output combo

Bhanuprakash Modem bhanuprakash.modem at intel.com
Tue Mar 28 11:17:45 UTC 2023


To use i915_pipe_output_combo_valid(), tests must set output
to pipe. Instead of throwing an error, just return as a valid
combo.

Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
 lib/igt_kms.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index c12823d318e..e178ecffc1a 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -5912,7 +5912,10 @@ bool i915_pipe_output_combo_valid(igt_display_t *display)
 		combo++;
 	}
 
-	igt_assert_f(combo, "At least one pipe/output combo needed.\n");
+	if (!combo) {
+		igt_debug("At least one pipe/output combo needed.\n");
+		return true;
+	}
 
 	/*
 	 * Check the given pipe/output combo is valid for Bigjoiner.
-- 
2.40.0



More information about the igt-dev mailing list