XLibre/xf86-video-amdgpu
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-amdgpu.git synced 2026-04-14 11:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check Xorg version at runtime instead of build time in two places

Browse Source 
This means that all possible paths can be handled as intended, no matter
which Xorg version the driver happened to be compiled against.

(Ported from radeon commit 350a2645a1b127227ff294c0b62d20000d0fd48a)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2016-11-02 12:35:55 +09:00
parent 5da43c5da8
commit 1352a1d2f7
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
man/amdgpu.man
View File

@@ -65,7 +65,7 @@ will assign xrandr outputs LVDS and VGA-0 to this instance of the driver.
Define the maximum level of DRI to enable. Valid values are 2 for DRI2 or 3 for DRI3.
The default is
.B 3 for DRI3
if the driver was compiled for Xorg >= 1.18.3, otherwise
if the Xorg version is >= 1.18.3, otherwise
.B 2 for DRI2.
.TP
.BI "Option \*qEnablePageFlip\*q \*q" boolean \*q

6
src/amdgpu_kms.c
View File

@@ -1713,11 +1713,7 @@ Bool AMDGPUScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
}
#endif
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,18,3,0,0)
value = TRUE;
#else
value = FALSE;
#endif
value = xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0);
from = X_DEFAULT;
if (info->use_glamor) {

8
src/drmmode_display.c
View File

@@ -607,10 +607,10 @@ drmmode_can_use_hw_cursor(xf86CrtcPtr crtc)
return FALSE;
#endif
#if defined(AMDGPU_PIXMAP_SHARING) && \
XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(1,18,99,901,0)
/* HW cursor not supported with RandR 1.4 multihead */
if (!xorg_list_is_empty(&crtc->scrn->pScreen->pixmap_dirty_list))
#if defined(AMDGPU_PIXMAP_SHARING)
/* HW cursor not supported with RandR 1.4 multihead up to 1.18.99.901 */
if (xorgGetVersion() <= XORG_VERSION_NUMERIC(1,18,99,901,0) &&
!xorg_list_is_empty(&crtc->scrn->pScreen->pixmap_dirty_list))
return FALSE;
#endif