[PATCH i-g-t 11/25] lib/kms: Move and rename igt_count_display_format_mod()

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

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

igt_count_display_format_mod() is a tightly coupled counterpart
of display_format_mods_union(). They both have to implement the
exact same loop over crtcs+planes or things will fall apart.

Move the pair next to each other and name them similarly to keep
the relationship clear.

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

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index ac0917d907a0..0d604bc76910 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -6299,23 +6299,6 @@ bool igt_plane_has_format_mod(igt_plane_t *plane, uint32_t format,
 						       format, modifier);
 }
 
-static int igt_count_display_format_mod(igt_display_t *display)
-{
-	igt_crtc_t *crtc;
-	int count = 0;
-
-	for_each_crtc(display, crtc) {
-		igt_plane_t *plane;
-
-		for_each_plane_on_crtc(crtc,
-				       plane) {
-			count += plane->format_mods.count;
-		}
-	}
-
-	return count;
-}
-
 static void
 format_mods_append(struct igt_format_mods *format_mods,
 		   uint32_t format, uint64_t modifier)
@@ -6344,6 +6327,21 @@ format_mods_union(struct igt_format_mods *format_mods_dst,
 				   format_mods_src->modifiers[i]);
 }
 
+static int display_format_mods_count(igt_display_t *display)
+{
+	igt_crtc_t *crtc;
+	int count = 0;
+
+	for_each_crtc(display, crtc) {
+		igt_plane_t *plane;
+
+		for_each_plane_on_crtc(crtc, plane)
+			count += plane->format_mods.count;
+	}
+
+	return count;
+}
+
 static void display_format_mods_union(igt_display_t *display,
 				      struct igt_format_mods *format_mods)
 {
@@ -6359,7 +6357,7 @@ static void display_format_mods_union(igt_display_t *display,
 
 static void igt_fill_display_format_mod(igt_display_t *display)
 {
-	int count = igt_count_display_format_mod(display);
+	int count = display_format_mods_count(display);
 
 	if (!count)
 		return;
-- 
2.52.0