[PATCH i-g-t 10/25] lib/kms: Extract display_format_mods_union()

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

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

Extract the loop over crtc+planes from igt_fill_display_format_mod()
into display_format_mods_union() that can be used to fill any
format_mods struct with the union of the planes' format_mods.

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

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 2f23d988438d..ac0917d907a0 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -6344,10 +6344,22 @@ format_mods_union(struct igt_format_mods *format_mods_dst,
 				   format_mods_src->modifiers[i]);
 }
 
+static void display_format_mods_union(igt_display_t *display,
+				      struct igt_format_mods *format_mods)
+{
+	igt_crtc_t *crtc;
+
+	for_each_crtc(display, crtc) {
+		igt_plane_t *plane;
+
+		for_each_plane_on_crtc(crtc, plane)
+			format_mods_union(format_mods, &plane->format_mods);
+	}
+}
+
 static void igt_fill_display_format_mod(igt_display_t *display)
 {
 	int count = igt_count_display_format_mod(display);
-	igt_crtc_t *crtc;
 
 	if (!count)
 		return;
@@ -6361,15 +6373,9 @@ static void igt_fill_display_format_mod(igt_display_t *display)
 	 */
 	display->format_mods.count = 0;
 
-	for_each_crtc(display, crtc) {
-		igt_plane_t *plane;
+	display_format_mods_union(display, &display->format_mods);
 
-		for_each_plane_on_crtc(crtc,
-				       plane) {
-			format_mods_union(&display->format_mods, &plane->format_mods);
-			igt_assert_lte(display->format_mods.count, count);
-		}
-	}
+	igt_assert_lte(display->format_mods.count, count);
 }
 
 /**
-- 
2.52.0