[PATCH i-g-t 08/11] lib/kms: Use '{old, new}_primary' variable names in plane swapping

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

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

Make the primary plane swapping a bit less confusing by
renaming the variables to '{old,new}_primary'

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/igt_kms.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 7ae166253a3f..ef3215332e29 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -3022,10 +3022,10 @@ 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[0];
-			igt_plane_t *assigned_primary =
+			igt_plane_t *old_primary = &pipe->planes[0];
+			igt_plane_t *new_primary =
 				igt_get_assigned_primary(output, pipe);
-			int assigned_primary_index = assigned_primary->index;
+			int new_primary_index = new_primary->index;
 
 			/*
 			 * If the driver-assigned primary plane isn't at
@@ -3034,11 +3034,11 @@ void igt_display_reset_outputs(igt_display_t *display)
 			 *
 			 * This way, the primary plane is always at index 0.
 			 */
-			if (assigned_primary_index != 0) {
-				assigned_primary->index = 0;
-				primary->index = assigned_primary_index;
+			if (new_primary_index != 0) {
+				new_primary->index = 0;
+				old_primary->index = new_primary_index;
 
-				igt_swap(pipe->planes[assigned_primary_index],
+				igt_swap(pipe->planes[new_primary_index],
 					 pipe->planes[0]);
 			}
 		}
-- 
2.51.2