[PATCH i-g-t 5/5] lib/kms: Make igt_first_crtc_with_single_output() skip if no CRTC/output can be found

[Ville Syrjala <ville.syrjala@linux.intel.com>]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Have igt_first_crtc_with_single_output() skip if a suitable CRTC/output
combination can't be found. All callers currently skip based on the
return value.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/igt_kms.c                | 2 ++
 tests/intel/gem_exec_reloc.c | 1 -
 tests/kms_plane.c            | 1 -
 tests/kms_plane_scaling.c    | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index a9673a9a6565..c302021be9b1 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -8019,6 +8019,8 @@ igt_crtc_t *igt_first_crtc_with_single_output(igt_display_t *display, igt_output
 		return crtc;
 	}
 
+	igt_skip("No valid CRTC/output combinations\n");
+
 	*ret_output = NULL;
 
 	return NULL;
diff --git a/tests/intel/gem_exec_reloc.c b/tests/intel/gem_exec_reloc.c
index ed4e77ec93d3..e480337a0bd8 100644
--- a/tests/intel/gem_exec_reloc.c
+++ b/tests/intel/gem_exec_reloc.c
@@ -1517,7 +1517,6 @@ static void scanout(int i915,
 	igt_display_reset(dpy);
 
 	crtc = igt_first_crtc_with_single_output(dpy, &output);
-	igt_require(crtc);
 
 	igt_output_set_crtc(output, crtc);
 
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index 6a78c9ff0941..98705a897205 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -1364,7 +1364,6 @@ static void test_planar_settings(data_t *data)
 	}
 
 	crtc = igt_first_crtc_with_single_output(display, &output);
-	igt_require(crtc);
 
 	igt_output_set_crtc(output, crtc);
 	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index ab619fb2b532..8d34619b328f 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -1181,7 +1181,6 @@ static void invalid_parameter_tests(data_t *d)
 
 	igt_fixture() {
 		crtc = igt_first_crtc_with_single_output(display, &output);
-		igt_require(crtc);
 
 		igt_output_set_crtc(output, crtc);
 		plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
-- 
2.52.0