xf86-video-ati: Branch 'master'

[Michel Dänzer]

 man/radeon.man      |    6 +++---
 src/radeon_glamor.c |   11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 515bcf14d514f9dcaaf30fd0bf1ef6dd6ba9a0cd
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Mar 4 12:34:26 2014 +0900

    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 at amd.com>

diff --git a/man/radeon.man b/man/radeon.man
index 1363d8b..7edb5e6 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 1d666d1..a354c78 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");