[PATCH i-g-t v2 17/25] lib/kms: Add helpers to query igt_format_mods

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

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

Add three new helpers for igt_format_mods:
- igt_format_mods_has_format_and_modifier()
- igt_format_mods_has_format()
- igt_format_mods_has_modifier()

These should be useful to some tests, avoiding for the tests
to iterate the igt_format_mods directly.

v2: Fix _modifier type in igt_format_mods_*()

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

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 75f7ca2d64e0..96fc7837b783 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -6285,8 +6285,8 @@ 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)
+bool igt_format_mods_has_format_and_modifier(const struct igt_format_mods *format_mods,
+					     uint32_t format, uint64_t modifier)
 {
 	uint64_t _modifier;
 	uint32_t _format;
@@ -6299,6 +6299,36 @@ static bool igt_format_mods_has_format_and_modifier(const struct igt_format_mods
 	return false;
 }
 
+bool igt_format_mods_has_format(const struct igt_format_mods *format_mods,
+				uint32_t format)
+{
+	uint64_t _modifier;
+	uint32_t _format;
+
+	for_each_format_and_modifier(format_mods, _format, _modifier) {
+		if (_format == format)
+			return true;
+		(void)_modifier;
+	}
+
+	return false;
+}
+
+bool igt_format_mods_has_modifier(const struct igt_format_mods *format_mods,
+				  uint64_t modifier)
+{
+	uint64_t _modifier;
+	uint32_t _format;
+
+	for_each_format_and_modifier(format_mods, _format, _modifier) {
+		if (_modifier == modifier)
+			return true;
+		(void)_format;
+	}
+
+	return false;
+}
+
 /**
  * igt_plane_has_format_mod:
  * @plane: Target plane
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 2f4526407aa2..037defa63657 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -1204,8 +1204,16 @@ bool igt_connector_event_detected(struct udev_monitor *mon, uint32_t conn_id,
 void igt_flush_uevents(struct udev_monitor *mon);
 void igt_cleanup_uevents(struct udev_monitor *mon);
 
+bool igt_format_mods_has_format_and_modifier(const struct igt_format_mods *format_mods,
+					     uint32_t format, uint64_t modifier);
+bool igt_format_mods_has_format(const struct igt_format_mods *format_mods,
+				uint32_t format);
+bool igt_format_mods_has_modifier(const struct igt_format_mods *format_mods,
+				  uint64_t modifier);
+
 bool igt_display_has_format_mod(igt_display_t *display, uint32_t format, uint64_t modifier);
 bool igt_plane_has_format_mod(igt_plane_t *plane, uint32_t format, uint64_t modifier);
+bool igt_plane_has_modifier(igt_plane_t *plane, uint64_t modifier);
 
 /**
  * igt_vblank_after_eq:
-- 
2.52.0