[PATCH i-g-t v2 16/25] lib/kms: Introduce igt_format_mods iterators

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

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

Add three new iterators:
- for_each_format_and_modifier()
- for_each_format_with_modifier()
- for_each_modifier_with_format()

Each one takes a igt_format_mods structure, and iterates it
accordingly.

Convert igt_format_mods_has_format_and_modifier() to use
for_each_format_and_modifier() as the first step.

v2: Fix _modifier type in igt_format_mods_has_format_and_modifier()
    Make the macros a bit more type safe

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/igt_aux.h |  3 +++
 lib/igt_kms.c |  8 ++++----
 lib/igt_kms.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/lib/igt_aux.h b/lib/igt_aux.h
index 56761a3b3eaa..30530a4040ce 100644
--- a/lib/igt_aux.h
+++ b/lib/igt_aux.h
@@ -250,6 +250,9 @@ void igt_debug_interactive_mode_check(const char *var, const char *expected);
 			      __cmp(x, y, op), \
 			      __cmp_once(x, y, igt_unique(igt_tokencat(prefix, __x)), igt_unique(igt_tokencat(prefix, __y)), op))
 
+#define assert_type(x, type) \
+	(void)({_Static_assert(__builtin_types_compatible_p(typeof(x), type), #x " must be " #type);})
+
 #define min(x, y)	__careful_cmp(x, y, <, min)
 #define max(x, y)	__careful_cmp(x, y, >, max)
 
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index b90d34e61359..75f7ca2d64e0 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -6288,11 +6288,11 @@ 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;
+	uint64_t _modifier;
+	uint32_t _format;
 
-	for (i = 0; i < format_mods->count; i++) {
-		if (format_mods->formats[i] == format &&
-		    format_mods->modifiers[i] == modifier)
+	for_each_format_and_modifier(format_mods, _format, _modifier) {
+		if (_format == format && _modifier == modifier)
 			return true;
 	}
 
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index e02c5dd25d16..2f4526407aa2 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -828,6 +828,50 @@ igt_output_crtc_t *__igt_output_crtc_populate(igt_display_t *display,
 		for_each_if (((format) = (plane)->drm_plane->formats[__i], \
 			      1))
 
+/**
+ * for_each_format_and_modifier:
+ * @format_mods: a pointer to an #igt_format_mod structure
+ * @format: format iterator
+ * @modifier: modifier iterator
+ *
+ * This for loop iterates over all format+modifier combinations.
+ */
+#define for_each_format_and_modifier(format_mods, format, modifier) \
+	for (int igt_unique(__i) = 0; igt_unique(__i) < (format_mods)->count; igt_unique(__i)++) \
+		for_each_if ((assert_type((format), uint32_t), \
+			      assert_type((modifier), uint64_t), \
+			      (format) = (format_mods)->formats[igt_unique(__i)], \
+			      (modifier) = (format_mods)->modifiers[igt_unique(__i)], \
+			      1))
+
+/**
+ * for_each_format_with_modifier:
+ * @format_mods: a pointer to an #igt_format_mod structure
+ * @modifier: specified modifier
+ * @format: format iterator
+ *
+ * This for loop iterates over all formats supporting @modifier.
+ */
+#define for_each_format_with_modifier(format_mods, format, modifier) \
+	for (int igt_unique(__i) = 0; igt_unique(__i) < (format_mods)->count; igt_unique(__i)++) \
+		for_each_if ((assert_type((format), uint32_t), \
+			      (format) = (format_mods)->formats[igt_unique(__i)], \
+			      (modifier) == (format_mods)->modifiers[igt_unique(__i)]))
+
+/**
+ * for_each_modifier_with_format:
+ * @format_mods: a pointer to an #igt_format_mod structure
+ * @format: specified format
+ * @modifier: modifier iterator
+ *
+ * This for loop iterates over all modifiers supporting @format.
+ */
+#define for_each_modifier_with_format(format_mods, format, modifier) \
+	for (int igt_unique(__i) = 0; igt_unique(__i) < (format_mods)->count; igt_unique(__i)++) \
+		for_each_if ((assert_type((modifier), uint64_t), \
+			      (modifier) = (format_mods)->modifiers[igt_unique(__i)], \
+			      (format) == (format_mods)->formats[igt_unique(__i)]))
+
 #define IGT_FIXED(i,f)	((i) << 16 | (f))
 
 /**
-- 
2.52.0