[PATCH i-g-t 22/25] tests/kms_async_flips: Use igt_format_mods_has_modifier()

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

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

Use igt_format_mods_has_modifier() instead of hand rolling it
for the linear check.

And to make the code less convoluted, let's just look for
whatever modifier we want to use, linear or not.

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

diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c
index 3d8c37631e2a..e8c9979bd06d 100644
--- a/tests/kms_async_flips.c
+++ b/tests/kms_async_flips.c
@@ -869,20 +869,6 @@ static void test_crc(data_t *data)
 	igt_assert_lt(data->frame_count * 2, data->flip_count);
 }
 
-static void require_linear_modifier(data_t *data)
-{
-	for (int i = 0; i < data->plane->format_mods_async.count; i++) {
-		uint64_t modifier = data->plane->format_mods_async.modifiers[i];
-
-		if (modifier == DRM_FORMAT_MOD_LINEAR) {
-			data->modifier = DRM_FORMAT_MOD_LINEAR;
-			return;
-		}
-	}
-
-	igt_skip("Linear modifier not supported for async flips on this platform\n");
-}
-
 static void run_test(data_t *data, void (*test)(data_t *))
 {
 	igt_crtc_t *crtc;
@@ -903,10 +889,13 @@ static void run_test(data_t *data, void (*test)(data_t *))
 		test_init(data);
 
 		if (data->linear_modifier)
-			require_linear_modifier(data);
+			data->modifier = DRM_FORMAT_MOD_LINEAR;
 		else
 			data->modifier = default_modifier(data);
 
+		igt_require(igt_format_mods_has_modifier(&data->plane->format_mods_async,
+							 data->modifier));
+
 		igt_dynamic_f("pipe-%s-%s", igt_crtc_name(crtc),
 			      data->output->name) {
 			/*
-- 
2.52.0