[igt-dev] [PATCH] tests/kms_atomic_transition: Enable Primary Plane on Enabling CRTC.

Mark Yacoub markyacoub at chromium.org
Mon Apr 12 16:21:35 UTC 2021


I noticed I sent a ping on the CI test rather than this patch, so sending a
friendly reminder here instead.
Thanks!

On Tue, Mar 23, 2021 at 11:08 AM Mark Yacoub <markyacoub at chromium.org>
wrote:

> From: Mark Yacoub <markyacoub at google.com>
>
> Setup all plane params before committing anything.
> Do not disable Primary Plane whenever a CRTC is getting enabled.
>
> AMD Driver requires the primary plane to be enabled whenever the CRTC is,
> otherwise
> drm_mode_cursor_universal may end up trying to enable the cursor plane
> while all other
> planes are disabled, which is not supported by the hardware.
>
> Tested on Delbin and Volteer with no regression or added latency.
>
> ---
>  tests/kms_atomic_transition.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
> index 9689bf4d..cfa04dcd 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -172,7 +172,7 @@ wm_setup_plane(data_t *data, enum pipe pipe,
>                         continue;
>
>                 if (!mask || !(parms[i].mask & mask)) {
> -                       if (plane->values[IGT_PLANE_FB_ID]) {
> +                       if (plane->values[IGT_PLANE_FB_ID] && plane->type
> != DRM_PLANE_TYPE_PRIMARY) {
>                                 igt_plane_set_fb(plane, NULL);
>                                 planes_set_up++;
>                         }
> @@ -516,10 +516,9 @@ run_transition_test(data_t *data, enum pipe pipe,
> igt_output_t *output,
>                 igt_output_set_pipe(output, pipe);
>         }
>
> -       igt_display_commit2(&data->display, COMMIT_ATOMIC);
> -
>         setup_parms(data, pipe, mode, &fb, &argb_fb, &sprite_fb, parms,
> &iter_max);
> -
> +       igt_display_commit2(&data->display, COMMIT_ATOMIC);
> +
>         /*
>          * In some configurations the tests may not run to completion with
> all
>          * sprite planes lit up at 4k resolution, try decreasing
> width/size of secondary
> --
> 2.31.0.rc2.261.g7f71774620-goog
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/igt-dev/attachments/20210412/e0c110fa/attachment.htm>


More information about the igt-dev mailing list