[igt-dev] [PATCH i-g-t v2 1/2] tests/kms_universal_plane: Test cleanup

[Modem, Bhanuprakash]

On Fri-05-08-2022 10:38 am, Ananya Sharma wrote:
> Before running the subtest we need to sanitize the system
> state to default,used igt_display_reset() to sanitize the state.
> 
> Signed-off-by: Ananya Sharma <ananya.sharma at intel.com>
> ---
>   tests/kms_universal_plane.c | 15 ++++++++++-----
>   1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
> index 3cb6d704..bd0900a2 100644
> --- a/tests/kms_universal_plane.c
> +++ b/tests/kms_universal_plane.c

The igt_fixture block inside run_tests_for_pipe() is redundant, please 
drop it.

> @@ -107,7 +107,7 @@ functional_test_fini(functional_test_t *test, igt_output_t *output)
>   	igt_remove_fb(test->data->drm_fd, &test->red_fb);
>   	igt_remove_fb(test->data->drm_fd, &test->yellow_fb);
>   
> -	igt_output_set_pipe(output, PIPE_ANY);
> +	igt_output_set_pipe(output, PIPE_NONE);
>   	igt_display_commit2(&test->data->display, COMMIT_LEGACY);
>   }
>   
> @@ -135,6 +135,7 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>   	int num_primary = 0, num_cursor = 0;
>   	int i;
>   
> +	igt_display_reset(&data->display);
>   	igt_require_pipe(display, pipe);

igt_require_pipe() is redundant, please drop everywhere.

>   
>   	igt_info("Testing connector %s using pipe %s\n", igt_output_name(output),
> @@ -345,7 +346,7 @@ sanity_test_fini(sanity_test_t *test, igt_output_t *output)
>   	igt_remove_fb(test->data->drm_fd, &test->undersized_fb);
>   	igt_remove_fb(test->data->drm_fd, &test->blue_fb);
>   
> -	igt_output_set_pipe(output, PIPE_ANY);
> +	igt_output_set_pipe(output, PIPE_NONE);
>   	igt_display_commit2(&test->data->display, COMMIT_LEGACY);
>   }
>   
> @@ -364,6 +365,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>   	int i;
>   	int expect;
>   
> +	igt_display_reset(&data->display);
>   	igt_require_pipe(&data->display, pipe);
>   
>   	igt_output_set_pipe(output, pipe);
> @@ -462,7 +464,7 @@ pageflip_test_fini(pageflip_test_t *test, igt_output_t *output)
>   	igt_remove_fb(test->data->drm_fd, &test->red_fb);
>   	igt_remove_fb(test->data->drm_fd, &test->blue_fb);
>   
> -	igt_output_set_pipe(output, PIPE_ANY);
> +	igt_output_set_pipe(output, PIPE_NONE);
>   	igt_display_commit2(&test->data->display, COMMIT_LEGACY);
>   }
>   
> @@ -477,6 +479,7 @@ pageflip_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>   	fd_set fds;
>   	int ret = 0;
>   
> +	igt_display_reset(&data->display);
>   	igt_require_pipe(&data->display, pipe);
>   
>   	igt_output_set_pipe(output, pipe);
> @@ -544,7 +547,7 @@ cursor_leak_test_fini(data_t *data,
>   	for (i = 0; i < 10; i++)
>   		igt_remove_fb(data->drm_fd, &curs[i]);
>   
> -	igt_output_set_pipe(output, PIPE_ANY);
> +	igt_output_set_pipe(output, PIPE_NONE);
>   }
>   
>   static int
> @@ -578,6 +581,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>   	int r, g, b;
>   	int count1, count2;
>   
> +	igt_display_reset(&data->display);
>   	igt_require_pipe(display, pipe);
>   	igt_require(display->has_cursor_plane);
>   	igt_require_intel(data->drm_fd);

Mentioned in patch [2/2] in this series, please move these checks to 
caller function.

> @@ -690,7 +694,7 @@ gen9_test_fini(gen9_test_t *test, igt_output_t *output)
>   	igt_remove_fb(test->data->drm_fd, &test->smallred_fb);
>   	igt_remove_fb(test->data->drm_fd, &test->smallblue_fb);
>   
> -	igt_output_set_pipe(output, PIPE_ANY);
> +	igt_output_set_pipe(output, PIPE_NONE);
>   	igt_display_commit2(&test->data->display, COMMIT_LEGACY);
>   }
>   
> @@ -706,6 +710,7 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>   
>   	int ret = 0;
>   
> +	igt_display_reset(&data->display);
>   	igt_require_intel(data->drm_fd);
>   	igt_skip_on(data->display_ver < 9);
>   	igt_require_pipe(&data->display, pipe);

Add igt_display_require_output() in fixture to avoid execution on 
no-display configs.

- Bhanu