[PATCH i-g-t 07/11] lib/kms: Nuke pipe->plane_cursor

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

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

Get rid of of the redundant pipe->plane_cursor. It'll
always be 'pipe->n_planes-1' after we've found the plane.
And before we've found the plane we can just check for
'pipe->planes[pipe->n_planes-1].index < 0'.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/igt_kms.c | 6 ++----
 lib/igt_kms.h | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 5bb8da1ec2c5..7ae166253a3f 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -3061,10 +3061,9 @@ static void igt_crtc_plane_init(igt_display_t *display,
 		index = 0;
 
 		pipe->num_primary_planes++;
-	} else if (type == DRM_PLANE_TYPE_CURSOR && pipe->plane_cursor == -1) {
+	} else if (type == DRM_PLANE_TYPE_CURSOR && pipe->planes[pipe->n_planes - 1].index < 0) {
 		index = pipe->n_planes - 1;
 
-		pipe->plane_cursor = index;
 		display->has_cursor_plane = true;
 	} else {
 		for (index = 1; index < pipe->n_planes; index++) {
@@ -3113,7 +3112,6 @@ static void igt_crtc_init(igt_display_t *display,
 	int j;
 
 	pipe->display = display;
-	pipe->plane_cursor = -1;
 	pipe->planes = NULL;
 	pipe->num_primary_planes = 0;
 
@@ -3566,7 +3564,7 @@ igt_plane_t *igt_pipe_get_plane_type(igt_crtc_t *pipe, int plane_type)
 
 	switch(plane_type) {
 	case DRM_PLANE_TYPE_CURSOR:
-		plane_idx = pipe->plane_cursor;
+		plane_idx = pipe->n_planes - 1;
 		break;
 	case DRM_PLANE_TYPE_PRIMARY:
 		plane_idx = 0;
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 810eb7497834..4a814f0e9962 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -489,7 +489,6 @@ struct igt_crtc {
 
 	int n_planes;
 	int num_primary_planes;
-	int plane_cursor;
 	igt_plane_t *planes;
 
 	uint64_t changed;
-- 
2.51.2