[PATCH 2/2] glamor: Enable by default on SI

[Michel Dänzer]

From: Michel Dänzer <michel.daenzer at amd.com>

We should now handle its major initialization failure cases gracefully.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 man/radeon.man      | 2 ++
 src/radeon_glamor.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/radeon.man b/man/radeon.man
index 7de370a..5462e5b 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -254,6 +254,8 @@ Chooses between available acceleration architectures.  Valid values are
 and
 .B glamor.
 The default is
+.B glamor
+as of TAHITI, otherwise
 .B EXA.
 
 .PP
diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index ef7d95c..5ee193c 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -87,10 +87,10 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
 		return FALSE;
 
 	s = xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);
-	if (s == NULL)
+	if (s == NULL && info->ChipFamily < CHIP_FAMILY_TAHITI)
 		return FALSE;
 
-	if (strcasecmp(s, "glamor") != 0)
+	if (s && strcasecmp(s, "glamor") != 0)
 		return FALSE;
 
 	if (!xf86LoaderCheckSymbol("glamor_egl_init")) {
-- 
1.8.2.rc3