[PATCH i-g-t 06/11] lib/kms: Nuke pipe->plane_primary

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

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

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

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

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 233f326d487f..5bb8da1ec2c5 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -3022,29 +3022,24 @@ void igt_display_reset_outputs(igt_display_t *display)
 		output = igt_get_single_output_for_pipe(display, i);
 
 		if (pipe->num_primary_planes > 1) {
-			igt_plane_t *primary =
-				&pipe->planes[pipe->plane_primary];
+			igt_plane_t *primary = &pipe->planes[0];
 			igt_plane_t *assigned_primary =
 				igt_get_assigned_primary(output, pipe);
 			int assigned_primary_index = assigned_primary->index;
 
 			/*
 			 * If the driver-assigned primary plane isn't at
-			 * the pipe->plane_primary index, swap it with
-			 * the plane that's currently at the
-			 * plane_primary index and update plane->index
-			 * accordingly.
+			 * index 0, swap it with the plane that's currently
+			 * at index 0 and update the indexes accordingly.
 			 *
-			 * This way, we can preserve pipe->plane_primary
-			 * as 0 so that tests that assume
-			 * pipe->plane_primary is always 0 won't break.
+			 * This way, the primary plane is always at index 0.
 			 */
-			if (assigned_primary_index != pipe->plane_primary) {
-				assigned_primary->index = pipe->plane_primary;
+			if (assigned_primary_index != 0) {
+				assigned_primary->index = 0;
 				primary->index = assigned_primary_index;
 
 				igt_swap(pipe->planes[assigned_primary_index],
-					 pipe->planes[pipe->plane_primary]);
+					 pipe->planes[0]);
 			}
 		}
 	}
@@ -3062,10 +3057,9 @@ static void igt_crtc_plane_init(igt_display_t *display,
 	igt_plane_t *plane;
 	int index;
 
-	if (type == DRM_PLANE_TYPE_PRIMARY && pipe->plane_primary == -1) {
+	if (type == DRM_PLANE_TYPE_PRIMARY && pipe->planes[0].index < 0) {
 		index = 0;
 
-		pipe->plane_primary = index;
 		pipe->num_primary_planes++;
 	} else if (type == DRM_PLANE_TYPE_CURSOR && pipe->plane_cursor == -1) {
 		index = pipe->n_planes - 1;
@@ -3120,7 +3114,6 @@ static void igt_crtc_init(igt_display_t *display,
 
 	pipe->display = display;
 	pipe->plane_cursor = -1;
-	pipe->plane_primary = -1;
 	pipe->planes = NULL;
 	pipe->num_primary_planes = 0;
 
@@ -3156,12 +3149,6 @@ static void igt_crtc_init(igt_display_t *display,
 		igt_crtc_plane_init(display, pipe, resources, global_plane);
 	}
 
-	/*
-	 * At the bare minimum, we should expect to have a primary
-	 * plane, and it must be in slot 0.
-	 */
-	igt_assert_eq(pipe->plane_primary, 0);
-
 	for (j = 0; j < pipe->n_planes; j++)
 		igt_assert_lt(0, pipe->planes[j].index);
 }
@@ -3582,7 +3569,7 @@ igt_plane_t *igt_pipe_get_plane_type(igt_crtc_t *pipe, int plane_type)
 		plane_idx = pipe->plane_cursor;
 		break;
 	case DRM_PLANE_TYPE_PRIMARY:
-		plane_idx = pipe->plane_primary;
+		plane_idx = 0;
 		break;
 	case DRM_PLANE_TYPE_OVERLAY:
 		for(i = 0; i < pipe->n_planes; i++)
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index b00884640e16..810eb7497834 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -490,7 +490,6 @@ struct igt_crtc {
 	int n_planes;
 	int num_primary_planes;
 	int plane_cursor;
-	int plane_primary;
 	igt_plane_t *planes;
 
 	uint64_t changed;
-- 
2.51.2