

index 1363d8b4..7edb5e61 100644

--- a/

+++ b/ diff --git a/man/radeon.man b/man/radeon.manindex 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.

index 1d666d19..a354c781 100644

--- a/

+++ b/ diff --git a/src/radeon_glamor.c b/src/radeon_glamor.cindex 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.

"); + if (info->ChipFamily < CHIP_FAMILY_R300) { + xf86DrvMsg(scrn->scrnIndex, X_ERROR, + "glamor requires R300 or higher GPU, disabling.

"); return FALSE; } + if (info->ChipFamily < CHIP_FAMILY_RV515) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "glamor may not work (well) with GPUs < RV515.

"); + } + if (scrn->depth < 24) { xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING, "glamor requires depth >= 24, disabling.

");