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>
This commit is contained in:
Michel Dänzer
2016-11-21 18:15:05 +09:00
committed by Michel Dänzer
parent 1106b2f773
commit f11531c99f
2 changed files with 10 additions and 3 deletions

View File

@@ -293,7 +293,7 @@ Chooses between available acceleration architectures. Valid values are
.B glamor
(for R300 or higher). The default is
.B glamor
as of TAHITI, otherwise
with R600 or newer (with Xorg >= 1.18.3, otherwise with TAHITI or newer), otherwise
.B EXA.
.PP

View File

@@ -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)