[PATCH i-g-t 20/25] tests/kms_plane: 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 copies of for_each_format_and_modifier()
with the real thing.

The AMD thing here could more properly use a for_each_modifier(),
if we had one. But implementing one on top of igt_format_mods
would still iterate each modifier multiple times (assuming the
same modifier is supported with multiple formats). So we'd
rather want a modifier counterpart to for_each_plane_format().
drmModePlane gave us a nice shortcut to for_each_plane_format()
but sadly it doesn't extend that service to modifiers. So we'd
have to build the pure modifier list by hand...

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/kms_plane.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index 5923b5917579..b82346464049 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -1122,6 +1122,7 @@ static void test_format_plane(data_t *data, igt_crtc_t *crtc,
 	igt_crc_t ref_crc[MAX_CRC_SET][ARRAY_SIZE(colors_extended)];
 	struct igt_vec tested_formats;
 	struct format_mod ref = {};
+	struct format_mod f = {};
 	igt_crc_t* crcset;
 	bool result = true;
 
@@ -1182,14 +1183,7 @@ static void test_format_plane(data_t *data, igt_crtc_t *crtc,
 	 */
 	igt_require(num_unique_crcs(ref_crc[MULTIPLE_CRC_SET], data->num_colors) > 1);
 
-	for (int i = 0; i < plane->format_mods.count; i++) {
-		uint32_t format = plane->format_mods.formats[i];
-		uint64_t modifier = plane->format_mods.modifiers[i];
-		struct format_mod f = {
-			.format = format,
-			.modifier = modifier,
-		};
-
+	for_each_format_and_modifier(&plane->format_mods, f.format, f.modifier) {
 		if (data->mod != f.modifier)
 			continue;
 
@@ -1252,17 +1246,17 @@ static void test_format_plane(data_t *data, igt_crtc_t *crtc,
 static bool skip_plane(data_t *data, igt_plane_t *plane)
 {
 	int index = plane->index;
-	int i;
-
-	for (i = 0; i < plane->format_mods.count; i++) {
-		uint64_t modifier = plane->format_mods.modifiers[i];
+	uint64_t modifier;
+	uint32_t format;
 
+	for_each_format_and_modifier(&plane->format_mods, format, modifier) {
 		if (IS_AMD_FMT_MOD(modifier) &&
 		    (AMD_FMT_MOD_GET(DCC, modifier) ||
 		     AMD_FMT_MOD_GET(DCC_RETILE, modifier))) {
 			igt_debug("Skipping planes with DCC or DCC_RETILE\n");
 			return true;
 		}
+		(void)format;
 	}
 
 	if (data->extended)
-- 
2.52.0