[PATCH i-g-t 07/25] lib/kms: Extract igt_format_mods_has_format_with_modifier()

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

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

We have three copies of the same code to look for a specific
format+modifier combination in lib/igt_kms.c alone (more in
tests/). Consolidate the lib/igt_kms.c uses to a single function.
We'll take of tests/* later.

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

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index b3ee8a61683e..2a4e91d9ed7e 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -6270,6 +6270,20 @@ static void igt_fill_plane_format_mod(igt_display_t *display, igt_plane_t *plane
 	}
 }
 
+static bool igt_format_mods_has_format_and_modifier(const struct igt_format_mods *format_mods,
+						    uint32_t format, uint64_t modifier)
+{
+	int i;
+
+	for (i = 0; i < format_mods->count; i++) {
+		if (format_mods->formats[i] == format &&
+		    format_mods->modifiers[i] == modifier)
+			return true;
+	}
+
+	return false;
+}
+
 /**
  * igt_plane_has_format_mod:
  * @plane: Target plane
@@ -6281,16 +6295,8 @@ static void igt_fill_plane_format_mod(igt_display_t *display, igt_plane_t *plane
 bool igt_plane_has_format_mod(igt_plane_t *plane, uint32_t format,
 			      uint64_t modifier)
 {
-	int i;
-
-	for (i = 0; i < plane->format_mods.count; i++) {
-		if (plane->format_mods.formats[i] == format &&
-		    plane->format_mods.modifiers[i] == modifier)
-			return true;
-
-	}
-
-	return false;
+	return igt_format_mods_has_format_and_modifier(&plane->format_mods,
+						       format, modifier);
 }
 
 static int igt_count_display_format_mod(igt_display_t *display)
@@ -6316,15 +6322,15 @@ igt_add_display_format_mod(igt_display_t *display, uint32_t format,
 {
 	int i;
 
-	for (i = 0; i < display->format_mods.count; i++) {
-		if (display->format_mods.formats[i] == format &&
-		    display->format_mods.modifiers[i] == modifier)
-			return;
+	if (igt_format_mods_has_format_and_modifier(&display->format_mods,
+						    format, modifier))
+		return;
 
-	}
+	i = display->format_mods.count;
 
 	display->format_mods.formats[i] = format;
 	display->format_mods.modifiers[i] = modifier;
+
 	display->format_mods.count++;
 }
 
@@ -6371,16 +6377,8 @@ static void igt_fill_display_format_mod(igt_display_t *display)
 bool igt_display_has_format_mod(igt_display_t *display, uint32_t format,
 				uint64_t modifier)
 {
-	int i;
-
-	for (i = 0; i < display->format_mods.count; i++) {
-		if (display->format_mods.formats[i] == format &&
-		    display->format_mods.modifiers[i] == modifier)
-			return true;
-
-	}
-
-	return false;
+	return igt_format_mods_has_format_and_modifier(&display->format_mods,
+						       format, modifier);
 }
 
 /**
-- 
2.52.0