[PATCH i-g-t 01/19] tests/kms_plane_multiple: Clean up n_planes stuff

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

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

kms_plane_multiple currently assumes that every CRTC has as many
planes as the first CRTC. That is definitely not the case for some
Intel hardware, so stop assuming it. Instead make sure the number
of planes is simply valid for both CRTCs taking part in the test.

As a bonus we get rid of an annoying igt_crtc_for_pipe() call.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/kms_plane_multiple.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index 11029eb7f634..e1b5e8bce47f 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -476,11 +476,13 @@ static void test_plane_position_2_display(data_t *data, igt_crtc_t *crtc1,
 					  igt_output_t *output1, igt_output_t *output2,
 					  uint64_t modifier)
 {
-	igt_display_t *display = &data->display;
 	color_t blue  = { 0.0f, 0.0f, 1.0f };
 	igt_crc_t crc1, crc2;
-	int n_planes = opt.all_planes ?
-		       igt_crtc_for_pipe(display, 0)->n_planes : DEFAULT_N_PLANES;
+	int n_planes;
+
+	n_planes = min(crtc1->n_planes, crtc2->n_planes);
+	if (!opt.all_planes)
+		n_planes = min(n_planes, DEFAULT_N_PLANES);
 
 	/*
 	 * Note: We could use the dynamic way of calculating the maximum planes here
-- 
2.52.0