XLibre/xf86-video-ati
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ati.git synced 2026-03-24 01:24:43 +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.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2016-11-01 16:30:42 +09:00
committed by Michel Dänzer
parent 5df36de399
commit 350a2645a1
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
man/radeon.man
View File

@@ -271,7 +271,7 @@ Sea Islands.
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 and glamor is enabled, otherwise
if the Xorg version is >= 1.18.3 and glamor is enabled, otherwise
.B 2 for DRI2. Note:
DRI3 may not work correctly in all cases with EXA, enable at your own risk.
.TP

8
src/drmmode_display.c
View File

@@ -667,10 +667,10 @@ drmmode_can_use_hw_cursor(xf86CrtcPtr crtc)
return FALSE;
#endif
#if defined(RADEON_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(RADEON_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

9
src/radeon_kms.c
View File

@@ -2195,11 +2195,10 @@ Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
}
#endif
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,18,3,0,0)
value = info->use_glamor;
#else
value = FALSE;
#endif
if (xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0))
value = info->use_glamor;
else
value = FALSE;
from = X_DEFAULT;
if (!info->r600_shadow_fb) {