[PATCH i-g-t 06/19] tests/kms: Use igt_first_crtc_with_single_output()

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

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

A few kms tests (at least) don't really care what CRTC they run
on, as long as it's something with an output.

Replace the fixed 'igt_crtc_for_pipe(display, PIPE_A) +
igt_get_single_output_for_pipe()' combo (which may very well
fail) with igt_first_crtc_with_single_output() that will give
you something as long there's one valid CRTC+output combo
available.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/intel/gem_exec_reloc.c | 6 ++----
 tests/kms_plane.c            | 6 +++---
 tests/kms_plane_scaling.c    | 9 +++------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/tests/intel/gem_exec_reloc.c b/tests/intel/gem_exec_reloc.c
index 53d8a1e9aa7e..ed4e77ec93d3 100644
--- a/tests/intel/gem_exec_reloc.c
+++ b/tests/intel/gem_exec_reloc.c
@@ -1516,10 +1516,8 @@ static void scanout(int i915,
 
 	igt_display_reset(dpy);
 
-	crtc = igt_crtc_for_pipe(dpy, PIPE_A);
-
-	output = igt_get_single_output_for_pipe(dpy, crtc->pipe);
-	igt_require(output);
+	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 8cef94a1f37e..30655b75c7ea 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -1341,7 +1341,7 @@ test_pixel_formats(data_t *data, igt_crtc_t *crtc)
 static void test_planar_settings(data_t *data)
 {
 	igt_display_t *display = &data->display;
-	igt_crtc_t *crtc = igt_crtc_for_pipe(display, PIPE_A);
+	igt_crtc_t *crtc;
 	igt_output_t *output;
 	igt_fb_t fb, fb_ref;
 	igt_plane_t *primary;
@@ -1363,8 +1363,8 @@ static void test_planar_settings(data_t *data)
 		igt_require(display_ver >= 9);
 	}
 
-	output = igt_get_single_output_for_pipe(&data->display, crtc->pipe);
-	igt_require(output);
+	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 893f2830b446..1d91ad1493b1 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -1181,13 +1181,10 @@ static void invalid_parameter_tests(data_t *d)
 	};
 
 	igt_fixture() {
-		crtc = igt_crtc_for_pipe(display, PIPE_A);
-		output = igt_get_single_output_for_pipe(&d->display,
-							crtc->pipe);
-		igt_require(output);
+		crtc = igt_first_crtc_with_single_output(display, &output);
+		igt_require(crtc);
 
-		igt_output_set_crtc(output,
-				    crtc);
+		igt_output_set_crtc(output, crtc);
 		plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 
 		igt_require(get_num_scalers(&d->display, crtc->pipe) >= 1);
-- 
2.52.0