Allow enabling glamor on R500 (and R300) class 3D engines as well.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75709

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer 2014-03-04 12:34:26 +09:00 • committed by Michel Dänzer
commit 515bcf14d5
2 changed files with 11 additions and 6 deletions

View file

@ -271,9 +271,9 @@ Pageflipping is supported on all radeon hardware.
.BI "Option \*qAccelMethod\*q \*q" "string" \*q
Chooses between available acceleration architectures. Valid values are
.B EXA
and
.B glamor.
The default is
(for pre-TAHITI GPUs) and
.B glamor
(for R300 or higher). The default is
.B glamor
as of TAHITI, otherwise
.B EXA.

View file

@ -93,12 +93,17 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
if (s && strcasecmp(s, "glamor") != 0)
return FALSE;
if (info->ChipFamily < CHIP_FAMILY_R600) {
xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING,
"glamor requires R600 or newer GPU, disabling.\n");
if (info->ChipFamily < CHIP_FAMILY_R300) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"glamor requires R300 or higher GPU, disabling.\n");
return FALSE;
}
if (info->ChipFamily < CHIP_FAMILY_RV515) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"glamor may not work (well) with GPUs < RV515.\n");
}
if (scrn->depth < 24) {
xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING,
"glamor requires depth >= 24, disabling.\n");