diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2014-03-04 12:34:26 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2014-03-11 09:19:12 +0900 |
| commit | 515bcf14d514f9dcaaf30fd0bf1ef6dd6ba9a0cd (patch) | |
| tree | 6658ca1f9f09c083a112094f73abc362555c2cac | |
| parent | ea6d0affe52d82becadab6fb1c87f9261b0605a2 (diff) | |
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>
| -rw-r--r-- | man/radeon.man | 6 | ||||
| -rw-r--r-- | src/radeon_glamor.c | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/man/radeon.man b/man/radeon.man index 1363d8b4..7edb5e61 100644 --- a/man/radeon.man +++ b/man/radeon.man @@ -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. diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index 1d666d19..a354c781 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -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"); |