summaryrefslogtreecommitdiff
path: root/src/radeon_glamor.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-11-21 18:15:05 +0900
committerMichel Dänzer <michel@daenzer.net>2016-11-22 16:25:10 +0900
commitf11531c99fcd6473f58b4d10efaf3efd84304d8e (patch)
treed29664b4b1780b894af2b1c9c4816b7fdea97385 /src/radeon_glamor.c
parent1106b2f773ad0611c729b27f4c192a26b43ef1e7 (diff)
Enable glamor by default with >= R600 and Xorg >= 1.18.3
glamor should now perform at least as well as EXA in general, and this allows DRI3 to be enabled by default for >= R600. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/radeon_glamor.c')
-rw-r--r--src/radeon_glamor.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index b66848fc..590c9f0c 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -84,8 +84,15 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
return FALSE;
s = xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);
- if (s == NULL && info->ChipFamily < CHIP_FAMILY_TAHITI)
- return FALSE;
+ if (!s) {
+ if (xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0)) {
+ if (info->ChipFamily < CHIP_FAMILY_R600)
+ return FALSE;
+ } else {
+ if (info->ChipFamily < CHIP_FAMILY_TAHITI)
+ return FALSE;
+ }
+ }
if (s && strcasecmp(s, "glamor") != 0) {
if (info->ChipFamily >= CHIP_FAMILY_TAHITI)