[PATCH i-g-t 18/25] tests/chamelium/kms_chamelium_frames: Use for_each_format_and_modifier()

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

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

Replace the open coded for_each_format_and_modifier() with the real
thing.

igt_plane_for_each_format() would be a better fit here since we
don't need the modifier in the loop, but the test keeps track of
the index and stores that in a yet another array in order to
then pick a format+modifier combination in random. There's probably
a less convoluted way to implement this, but meh for now.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/chamelium/kms_chamelium_frames.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/chamelium/kms_chamelium_frames.c b/tests/chamelium/kms_chamelium_frames.c
index 3a59c2b51a9b..d1d76f26d6a0 100644
--- a/tests/chamelium/kms_chamelium_frames.c
+++ b/tests/chamelium/kms_chamelium_frames.c
@@ -305,14 +305,15 @@ static void randomize_plane_setup(chamelium_data_t *data, igt_plane_t *plane,
 	uint32_t idx[plane->format_mods.count];
 	unsigned int count = 0;
 	unsigned int i;
+	uint32_t f;
+	uint64_t m;
 
 	/* First pass to count the supported formats. */
-	for (i = 0; i < plane->format_mods.count; i++) {
-		uint32_t f = plane->format_mods.formats[i];
-
+	for_each_format_and_modifier(&plane->format_mods, f, m) {
 		if (igt_fb_supported_format(f) &&
 		    (allow_yuv || !igt_format_is_yuv(f)))
 			idx[count++] = i;
+		(void)m;
 	}
 
 	igt_assert(count > 0);
-- 
2.52.0