[PATCH xf86-video-ati 1/2] Use drmmode_crtc->scanout_id instead of 0 to check for scanout buffer

[Alex Deucher]

On Tue, Jul 11, 2017 at 5:17 AM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Preparation for following change, no functional change intended.
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>


> ---
>  src/radeon_dri2.c    | 5 +++--
>  src/radeon_kms.c     | 4 ++--
>  src/radeon_present.c | 2 +-
>  3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
> index 435bf5397..35fb60d91 100644
> --- a/src/radeon_dri2.c
> +++ b/src/radeon_dri2.c
> @@ -728,7 +728,8 @@ can_exchange(ScrnInfoPtr pScrn, DrawablePtr draw,
>         drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
>
>         if (crtc->enabled &&
> -           (crtc->rotatedData || drmmode_crtc->scanout[0].bo))
> +           (crtc->rotatedData ||
> +            drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo))
>             return FALSE;
>      }
>
> @@ -777,7 +778,7 @@ can_flip(ScrnInfoPtr pScrn, DrawablePtr draw,
>             continue;
>
>         if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
> -           drmmode_crtc->scanout[0].bo)
> +           drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
>             return FALSE;
>
>         if (drmmode_crtc->pending_dpms_mode == DPMSModeOn)
> diff --git a/src/radeon_kms.c b/src/radeon_kms.c
> index 3f14b4620..955efc621 100644
> --- a/src/radeon_kms.c
> +++ b/src/radeon_kms.c
> @@ -733,7 +733,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
>
>      drmmode_crtc = xf86_crtc->driver_private;
>      if (drmmode_crtc->scanout_update_pending ||
> -       !drmmode_crtc->scanout[0].pixmap ||
> +       !drmmode_crtc->scanout[drmmode_crtc->scanout_id].pixmap ||
>         drmmode_crtc->pending_dpms_mode != DPMSModeOn)
>         return;
>
> @@ -1027,7 +1027,7 @@ radeon_scanout_update(xf86CrtcPtr xf86_crtc)
>
>      if (!xf86_crtc->enabled ||
>         drmmode_crtc->scanout_update_pending ||
> -       !drmmode_crtc->scanout[0].pixmap ||
> +       !drmmode_crtc->scanout[drmmode_crtc->scanout_id].pixmap ||
>         drmmode_crtc->pending_dpms_mode != DPMSModeOn)
>         return;
>
> diff --git a/src/radeon_present.c b/src/radeon_present.c
> index e637d7868..e3a8f7e2b 100644
> --- a/src/radeon_present.c
> +++ b/src/radeon_present.c
> @@ -249,7 +249,7 @@ radeon_present_check_unflip(ScrnInfoPtr scrn)
>             continue;
>
>         if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
> -           drmmode_crtc->scanout[0].bo)
> +           drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
>             return FALSE;
>
>         if (drmmode_crtc->pending_dpms_mode == DPMSModeOn)
> --
> 2.13.2
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx