[PATCH i-g-t 03/19] tests/kms_lease: Consolidate igt_crtc_for_pipe() calls

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

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

kms_lease has igt_crtc_for_pipe() calls sprinkled all over the
place. Consolidate them to a few spots so that we can actually
see what's going on.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/kms_lease.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index 9f7935e99902..7531f9acf810 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -869,8 +869,11 @@ static void invalid_create_leases(data_t *data)
 	uint32_t object_ids[4];
 	struct drm_mode_create_lease mcl = {0};
 	drmModeRes *resources;
+	igt_crtc_t *crtc;
 	int tmp_fd, ret;
 
+	crtc = igt_crtc_for_pipe(&data->master.display, 0);
+
 	/* NULL array pointer */
 	mcl.object_count = 1;
 	igt_assert_eq(create_lease(data->master.fd, &mcl, NULL), -EFAULT);
@@ -887,11 +890,11 @@ static void invalid_create_leases(data_t *data)
 	igt_assert_eq(create_lease(data->master.fd, &mcl, NULL), -EINVAL);
 
 	/* no connector, non-universal_plane */
-	object_ids[0] = igt_crtc_for_pipe(&data->master.display, 0)->crtc_id;
+	object_ids[0] = crtc->crtc_id;
 	igt_assert_eq(create_lease(data->master.fd, &mcl, NULL), -EINVAL);
 
 	/* sanity check */
-	object_ids[0] = igt_crtc_for_pipe(&data->master.display, 0)->crtc_id;
+	object_ids[0] = crtc->crtc_id;
 	object_ids[1] = data->master.display.outputs[0].id;
 	mcl.object_count = 2;
 	igt_assert_eq(create_lease(data->master.fd, &mcl, NULL), 0);
@@ -902,8 +905,7 @@ static void invalid_create_leases(data_t *data)
 	igt_assert_eq(create_lease(data->master.fd, &mcl, NULL), -EINVAL);
 
 	/* sanity check */
-	object_ids[2] = igt_crtc_get_plane_type(igt_crtc_for_pipe(&data->master.display, 0),
-						DRM_PLANE_TYPE_PRIMARY)->drm_plane->plane_id;
+	object_ids[2] = igt_crtc_get_plane_type(crtc, DRM_PLANE_TYPE_PRIMARY)->drm_plane->plane_id;
 	mcl.object_count = 3;
 	igt_assert_eq(create_lease(data->master.fd, &mcl, NULL), 0);
 	close(mcl.fd);
@@ -1066,11 +1068,13 @@ static int _create_simple_lease(int master_fd, data_t *data, int expected_ret)
 {
 	uint32_t object_ids[3];
 	struct drm_mode_create_lease mcl;
+	igt_crtc_t *crtc;
 
-	object_ids[0] = igt_crtc_for_pipe(&data->master.display, 0)->crtc_id;
+	crtc = igt_crtc_for_pipe(&data->master.display, 0);
+
+	object_ids[0] = crtc->crtc_id;
 	object_ids[1] = data->master.display.outputs[0].id;
-	object_ids[2] = igt_crtc_get_plane_type(igt_crtc_for_pipe(&data->master.display, 0),
-						DRM_PLANE_TYPE_PRIMARY)->drm_plane->plane_id;
+	object_ids[2] = igt_crtc_get_plane_type(crtc, DRM_PLANE_TYPE_PRIMARY)->drm_plane->plane_id;
 	mcl.object_ids = (uint64_t) (uintptr_t) object_ids;
 	mcl.object_count = 3;
 	mcl.flags = 0;
@@ -1157,13 +1161,16 @@ static void implicit_plane_lease(data_t *data)
 	struct drm_mode_create_lease mcl;
 	struct drm_mode_get_lease mgl;
 	int ret;
-	uint32_t cursor_id = igt_crtc_get_plane_type(igt_crtc_for_pipe(&data->master.display, 0),
-						     DRM_PLANE_TYPE_CURSOR)->drm_plane->plane_id;
+	uint32_t cursor_id;
+	igt_crtc_t *crtc;
 
-	object_ids[0] = igt_crtc_for_pipe(&data->master.display, 0)->crtc_id;
+	crtc = igt_crtc_for_pipe(&data->master.display, 0);
+
+	cursor_id = igt_crtc_get_plane_type(crtc, DRM_PLANE_TYPE_CURSOR)->drm_plane->plane_id;
+
+	object_ids[0] = crtc->crtc_id;
 	object_ids[1] = data->master.display.outputs[0].id;
-	object_ids[2] = igt_crtc_get_plane_type(igt_crtc_for_pipe(&data->master.display, 0),
-						DRM_PLANE_TYPE_PRIMARY)->drm_plane->plane_id;
+	object_ids[2] = igt_crtc_get_plane_type(crtc, DRM_PLANE_TYPE_PRIMARY)->drm_plane->plane_id;
 	mcl.object_ids = (uint64_t) (uintptr_t) object_ids;
 	mcl.object_count = 3;
 	mcl.flags = 0;
-- 
2.52.0