[PATCH xf86-video-amdgpu] Make libdrm >= 2.4.72 requirement explicit

[Alex Deucher]

On Fri, Nov 25, 2016 at 4:35 AM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> And drop compatibility code for older versions.
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

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

> ---
>  configure.ac          |  2 +-
>  src/amdgpu_dri2.c     | 13 -------------
>  src/drmmode_display.h |  4 ----
>  3 files changed, 1 insertion(+), 18 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 6d0279e..11dc285 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -69,7 +69,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
>  XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
>
>  # Checks for libraries.
> -PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.58])
> +PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.72])
>  PKG_CHECK_MODULES(LIBDRM_AMDGPU, [libdrm_amdgpu >= 2.4.72])
>  PKG_CHECK_MODULES(GBM, [gbm])
>
> diff --git a/src/amdgpu_dri2.c b/src/amdgpu_dri2.c
> index c3a112d..ede6c0e 100644
> --- a/src/amdgpu_dri2.c
> +++ b/src/amdgpu_dri2.c
> @@ -784,14 +784,8 @@ drmVBlankSeqType amdgpu_populate_vbl_request_type(xf86CrtcPtr crtc)
>         if (crtc_id == 1)
>                 type |= DRM_VBLANK_SECONDARY;
>         else if (crtc_id > 1)
> -#ifdef DRM_VBLANK_HIGH_CRTC_SHIFT
>                 type |= (crtc_id << DRM_VBLANK_HIGH_CRTC_SHIFT) &
>                     DRM_VBLANK_HIGH_CRTC_MASK;
> -#else
> -               ErrorF("amdgpu driver bug: %s called for CRTC %d > 1, but "
> -                      "DRM_VBLANK_HIGH_CRTC_MASK not defined at build time\n",
> -                      __func__, crtc_id);
> -#endif
>
>         return type;
>  }
> @@ -1366,7 +1360,6 @@ Bool amdgpu_dri2_screen_init(ScreenPtr pScreen)
>         dri2_info.CopyRegion = amdgpu_dri2_copy_region;
>
>         if (info->drmmode.count_crtcs > 2) {
> -#ifdef DRM_CAP_VBLANK_HIGH_CRTC
>                 uint64_t cap_value;
>
>                 if (drmGetCap
> @@ -1381,12 +1374,6 @@ Bool amdgpu_dri2_screen_init(ScreenPtr pScreen)
>                                    "handle VBLANKs on CRTC > 1\n");
>                         scheduling_works = FALSE;
>                 }
> -#else
> -               xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
> -                          "You need to rebuild against a "
> -                          "newer libdrm to handle VBLANKs on CRTC > 1\n");
> -               scheduling_works = FALSE;
> -#endif
>         }
>
>         if (scheduling_works) {
> diff --git a/src/drmmode_display.h b/src/drmmode_display.h
> index 639b3fb..e9967a2 100644
> --- a/src/drmmode_display.h
> +++ b/src/drmmode_display.h
> @@ -36,10 +36,6 @@
>  #include "amdgpu_probe.h"
>  #include "amdgpu.h"
>
> -#ifndef DRM_CAP_TIMESTAMP_MONOTONIC
> -#define DRM_CAP_TIMESTAMP_MONOTONIC 0x6
> -#endif
> -
>  typedef struct {
>         unsigned fb_id;
>         drmModeFBPtr mode_fb;
> --
> 2.10.2
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx