[PATCH i-g-t 12/25] lib/kms: Make igt_fill_display_format_mod() more flexible

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

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

Currently igt_fill_display_format_mod() is hardcoded to operate
on display->format_mods (and its plane counterparts). We may
also want an async flip counterpart of this. To make that
possible adjust the code so that it can operate on other
igt_format_mods structures.

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

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 0d604bc76910..dc3486a795a4 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -6327,7 +6327,8 @@ 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)
+static int display_format_mods_count(igt_display_t *display,
+				     const struct igt_format_mods *(*plane_format_mods)(igt_plane_t *plane))
 {
 	igt_crtc_t *crtc;
 	int count = 0;
@@ -6336,14 +6337,15 @@ static int display_format_mods_count(igt_display_t *display)
 		igt_plane_t *plane;
 
 		for_each_plane_on_crtc(crtc, plane)
-			count += plane->format_mods.count;
+			count += plane_format_mods(plane)->count;
 	}
 
 	return count;
 }
 
 static void display_format_mods_union(igt_display_t *display,
-				      struct igt_format_mods *format_mods)
+				      struct igt_format_mods *format_mods,
+				      const struct igt_format_mods *(*plane_format_mods)(igt_plane_t *plane))
 {
 	igt_crtc_t *crtc;
 
@@ -6351,29 +6353,41 @@ static void display_format_mods_union(igt_display_t *display,
 		igt_plane_t *plane;
 
 		for_each_plane_on_crtc(crtc, plane)
-			format_mods_union(format_mods, &plane->format_mods);
+			format_mods_union(format_mods, plane_format_mods(plane));
 	}
 }
 
-static void igt_fill_display_format_mod(igt_display_t *display)
+static void display_format_mods_fill(igt_display_t *display,
+				     struct igt_format_mods *format_mods,
+				     const struct igt_format_mods *(*plane_format_mods)(igt_plane_t *plane))
 {
-	int count = display_format_mods_count(display);
+	int count = display_format_mods_count(display, plane_format_mods);
 
 	if (!count)
 		return;
 
-	format_mods_alloc(&display->format_mods, count);
+	format_mods_alloc(format_mods, count);
 
 	/*
 	 * Initial count was an upper bound and may include
 	 * duplicates. The final count, without duplicates,
 	 * is determined while filling the arrays.
 	 */
-	display->format_mods.count = 0;
+	format_mods->count = 0;
 
-	display_format_mods_union(display, &display->format_mods);
+	display_format_mods_union(display, format_mods, plane_format_mods);
 
-	igt_assert_lte(display->format_mods.count, count);
+	igt_assert_lte(format_mods->count, count);
+}
+
+static const struct igt_format_mods *plane_format_mods(igt_plane_t *plane)
+{
+	return &plane->format_mods;
+}
+
+static void igt_fill_display_format_mod(igt_display_t *display)
+{
+	display_format_mods_fill(display, &display->format_mods, plane_format_mods);
 }
 
 /**
-- 
2.52.0