[PATCH i-g-t v3] tests/kms_plane_multiple: Add clear skip message for skips

[Pranay Samala]

Add a check to skip the subtest when the required DRM modifier
is not supported. This avoids unnecessary test skips and
improves clarity by providing a proper skip message.

v2: Split function parameter changes into seperate commit (Rama)
v3: Combine both patches into single patch (Kamil)

Signed-off-by: Pranay Samala <pranay.samala at intel.com>
---
 tests/kms_plane_multiple.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index ebb026726..4e6ca780a 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -504,14 +504,14 @@ static void test_plane_position_2_display(data_t *data, enum pipe pipe1, enum pi
 	for_each_connected_output_local((display), (output)) \
 		for_each_if(igt_pipe_connector_valid((pipe), (output)))
 
-static void run_2_display_test(data_t *data, uint64_t modifier)
+static void run_2_display_test(data_t *data, uint64_t modifier, const char *name)
 {
 	enum pipe pipe1, pipe2;
 	igt_output_t *output1, *output2;
 	igt_display_t *display = &data->display;
 
-	if (!igt_display_has_format_mod(display, DRM_FORMAT_XRGB8888, modifier))
-		return;
+	igt_skip_on_f(!igt_display_has_format_mod(display, DRM_FORMAT_XRGB8888, modifier),
+		      "%s modifier is not supported\n", name);
 
 	igt_display_reset(display);
 
@@ -547,14 +547,14 @@ static void run_2_display_test(data_t *data, uint64_t modifier)
 	}
 }
 
-static void run_test(data_t *data, uint64_t modifier)
+static void run_test(data_t *data, uint64_t modifier, const char *name)
 {
 	enum pipe pipe;
 	igt_output_t *output;
 	igt_display_t *display = &data->display;
 
-	if (!igt_display_has_format_mod(display, DRM_FORMAT_XRGB8888, modifier))
-		return;
+	igt_skip_on_f(!igt_display_has_format_mod(display, DRM_FORMAT_XRGB8888, modifier),
+		      "%s modifier is not supported\n", name);
 
 	for_each_pipe_with_valid_output(display, pipe, output) {
 		igt_display_reset(display);
@@ -647,7 +647,7 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
 			     "reflected immediately after each commit.");
 
 		igt_subtest_with_dynamic(subtests[i].name)
-			run_test(&data, subtests[i].modifier);
+			run_test(&data, subtests[i].modifier, subtests[i].name);
 	}
 
 	for (int i = 0; i < ARRAY_SIZE(subtests); i++) {
@@ -660,7 +660,7 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
 
 			igt_require(valid_outputs > 1);
 
-			run_2_display_test(&data, subtests[i].modifier);
+			run_2_display_test(&data, subtests[i].modifier, subtests[i].name);
 		}
 	}
 
-- 
2.34.1