xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_glamor.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b2dba2906f0b2284f17f53fd5251ba0f03d52a8b
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu May 15 16:07:53 2014 +0900

    Don't disable acceleration on >= SI on attempts to force EXA
    
    Also make this case clear in the log file:
    
     (WW) RADEON(0): EXA not supported, using glamor
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index 4aea51d..210ddcf 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -90,8 +90,13 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
 	if (s == NULL && info->ChipFamily < CHIP_FAMILY_TAHITI)
 		return FALSE;
 
-	if (s && strcasecmp(s, "glamor") != 0)
-		return FALSE;
+	if (s && strcasecmp(s, "glamor") != 0) {
+		if (info->ChipFamily >= CHIP_FAMILY_TAHITI)
+			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+				   "EXA not supported, using glamor\n");
+		else
+			return FALSE;
+	}
 
 	if (info->ChipFamily < CHIP_FAMILY_R300) {
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,