[PATCH i-g-t v3 2/2] tests/kms_plane: Convert to dynamic subtests

[Juha-Pekka Heikkila]

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>

On 31.5.2024 9.06, Pranay Samala wrote:
> The test runs on all pipes on dynamic level to test all the supported
> pixel-formats and modifiers on current plane of that pipe.
> 
> Updating the test to execute on multiple planes on dynamic level.
> 
> Cc: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> Cc: Juha-pekka Heikkila <juha-pekka.heikkila at intel.com>
> Cc: Karthik B S <karthik.b.s at intel.com>
> 
> Signed-off-by: Pranay Samala <pranay.samala at intel.com>
> ---
>   tests/kms_plane.c | 27 +++++++++++++++++----------
>   1 file changed, 17 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/kms_plane.c b/tests/kms_plane.c
> index 7a17b700c..aac8e3ef0 100644
> --- a/tests/kms_plane.c
> +++ b/tests/kms_plane.c
> @@ -351,10 +351,11 @@ test_plane_position(data_t *data, enum pipe pipe)
>   	test_init(data, pipe);
>   	test_grab_crc(data, output, pipe, &green, data->flags, &reference_crc);
>   
> -	for (int plane = 1; plane < n_planes; plane++)
> -		test_plane_position_with_output(data, pipe, plane,
> -						output, &reference_crc,
> -						data->flags);
> +	for (int plane = 1; plane < n_planes; plane++) {
> +		igt_dynamic_f("pipe-%s-plane-%d", kmstest_pipe_name(pipe), plane)
> +			test_plane_position_with_output(data, pipe, plane, output,
> +							&reference_crc, data->flags);
> +	}
>   
>   	test_fini(data);
>   }
> @@ -1216,7 +1217,8 @@ test_pixel_formats(data_t *data, enum pipe pipe)
>   	for_each_plane_on_pipe(&data->display, pipe, plane) {
>   		if (skip_plane(data, plane))
>   			continue;
> -		result &= test_format_plane(data, pipe, output, plane, &primary_fb);
> +		igt_dynamic_f("pipe-%s-plane-%u", kmstest_pipe_name(pipe), plane->index)
> +			result &= test_format_plane(data, pipe, output, plane, &primary_fb);
>   	}
>   
>   	test_fini(data);
> @@ -1322,14 +1324,19 @@ static void run_test(data_t *data, void (*test)(data_t *, enum pipe))
>   			continue;
>   
>   		igt_output_set_pipe(data->output, PIPE_NONE);
> -		igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe))
> -			test(data, pipe);
> +		test(data, pipe);
>   
>   		if (is_pipe_limit_reached(++count))
>   			break;
>   	}
>   }
>   
> +static void dynamic_test_handler(data_t *data, enum pipe pipe)
> +{
> +	igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe))
> +		test_plane_panning(data, pipe);
> +}
> +
>   static void
>   run_tests_for_pipe_plane(data_t *data)
>   {
> @@ -1366,20 +1373,20 @@ run_tests_for_pipe_plane(data_t *data)
>   	igt_describe("verify plane panning at top-left position using primary plane");
>   	igt_subtest_with_dynamic_f("plane-panning-top-left") {
>   		data->flags = TEST_PANNING_TOP_LEFT;
> -		run_test(data, test_plane_panning);
> +		run_test(data, dynamic_test_handler);
>   	}
>   
>   	igt_describe("verify plane panning at bottom-right position using primary plane");
>   	igt_subtest_with_dynamic_f("plane-panning-bottom-right") {
>   		data->flags = TEST_PANNING_BOTTOM_RIGHT;
> -		run_test(data, test_plane_panning);
> +		run_test(data, dynamic_test_handler);
>   	}
>   
>   	igt_describe("verify plane panning at bottom-right position using primary plane and executes system"
>   		       "suspend cycles");
>   	igt_subtest_with_dynamic_f("plane-panning-bottom-right-suspend") {
>   		data->flags = TEST_PANNING_BOTTOM_RIGHT | TEST_SUSPEND_RESUME;
> -		run_test(data, test_plane_panning);
> +		run_test(data, dynamic_test_handler);
>   	}
>   
>   	igt_describe("verify planar settings for pixel format are accepted or rejected correctly");