[igt-dev] [PATCH 2/2 i-g-t][V2] tests/kms_universal_plane: Enable gen9_test_pipe for all devices

[Mark Yacoub]

On Mon, May 9, 2022 at 11:51 AM Alex Hung <alex.hung at amd.com> wrote:
>
> This subtest runs on non-i915 devices, and let's make it generic by
I like this, thank you!
> removing igt_require_intel and renaming it.
>
> Signed-off-by: Alex Hung <alex.hung at amd.com>
> ---
>  tests/kms_universal_plane.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
> index 3a3667e6..eab99962 100644
> --- a/tests/kms_universal_plane.c
> +++ b/tests/kms_universal_plane.c
> @@ -701,15 +701,14 @@ gen9_test_fini(gen9_test_t *test, igt_output_t *output)
>   * windowing)
>   */
>  static void
> -gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
> +pageflip_win_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>  {
>         gen9_test_t test = { .data = data };
>         igt_plane_t *primary;
>
>         int ret = 0;
> -
> -       igt_require_intel(data->drm_fd);
> -       igt_skip_on(data->display_ver < 9);
> +       if (is_i915_device(data->drm_fd))
> +               igt_skip_on(data->display_ver < 9);
you can do instead ` igt_skip_on(is_i915_device(data->drm_fd) &&
data->display_ver < 9);`
>         igt_require_pipe(&data->display, pipe);
>
>         igt_output_set_pipe(output, pipe);
> @@ -789,10 +788,10 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
>                         cursor_leak_test_pipe(data, pipe, output);
>
>         igt_describe("Check if pageflip succeeds in windowed setting");
> -       igt_subtest_f("universal-plane-gen9-features-pipe-%s",
> +       igt_subtest_f("universal-plane-pageflip-windowed-pipe-%s",
>                       kmstest_pipe_name(pipe))
>                 for_each_valid_output_on_pipe(&data->display, pipe, output)
> -                       gen9_test_pipe(data, pipe, output);
> +                       pageflip_win_test_pipe(data, pipe, output);
>  }
>
>  static data_t data;
> --
> 2.25.1
>