[PATCH i-g-t] tests/kms_flip_scaled_crc: Move require checks at the beginning of the subtest

[Karthik B S <karthik.b.s@intel.com>]

Previously, setup_fb() contained the igt_require() for format + modifier,
causing the dynamic test to be intialized only to skip eventually if the
combination is unsupported.
This patch moves format/modifier checks to the per-subtest level.

Additionally, linear framebuffers combined with REFLECT_X rotation are
not supported on Intel platforms prior to gen35. To make this explicit and
reduce CI run time, the test now performs an early skip for this
combination, clearly stating the reason in the skip message.

Signed-off-by: Karthik B S <karthik.b.s@intel.com>
---
 tests/intel/kms_flip_scaled_crc.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/intel/kms_flip_scaled_crc.c b/tests/intel/kms_flip_scaled_crc.c
index 954b46b5f..91e5793f4 100644
--- a/tests/intel/kms_flip_scaled_crc.c
+++ b/tests/intel/kms_flip_scaled_crc.c
@@ -670,9 +670,6 @@ const struct {
 static void setup_fb(data_t *data, struct igt_fb *newfb, uint32_t width,
 		     uint32_t height, uint64_t format, uint64_t modifier)
 {
-	igt_require(igt_display_has_format_mod(&data->display, format,
-					       modifier));
-
 	igt_create_color_fb(data->drm_fd, width, height,
 			    format, modifier, 0, 1, 0, newfb);
 }
@@ -901,6 +898,18 @@ int igt_main()
 	for (int index = 0; index < ARRAY_SIZE(flip_scenario_test); index++) {
 		igt_describe(flip_scenario_test[index].describe);
 		igt_subtest_with_dynamic(flip_scenario_test[index].name) {
+			igt_require(igt_display_has_format_mod(&data.display,
+							       flip_scenario_test[index].firstformat,
+							       flip_scenario_test[index].firstmodifier));
+			igt_require(igt_display_has_format_mod(&data.display,
+							       flip_scenario_test[index].secondformat,
+							       flip_scenario_test[index].secondmodifier));
+
+			if(flip_scenario_test[index].secondmodifier == DRM_FORMAT_MOD_LINEAR &&
+			   flip_scenario_test[index].secondrotation & IGT_REFLECT_X)
+				igt_require_f(data.gen >= 35,
+					      "Linear fb with REFLECT_X unsupported");
+
 			free_fbs(&data);
 			for_each_pipe(&data.display, pipe) {
 				bool found = false;
-- 
2.43.0