diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-11-25 18:34:40 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-11-28 17:39:18 +0900 |
| commit | ff31320644b4d17b9b3f0abd612c99769d3d9643 (patch) | |
| tree | 194dc0b1f0c18b4f5df82c08479d31c9306e2b6e | |
| parent | f9ba1e8fd48cd967a09c4e083b277505d08d3849 (diff) | |
Make libdrm >= 2.4.72 requirement explicit
And drop compatibility code for older versions.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/amdgpu_dri2.c | 13 | ||||
| -rw-r--r-- | src/drmmode_display.h | 4 |
3 files changed, 1 insertions, 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; |