summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2013-03-12 19:03:06 +0100
committerMichel Dänzer <michel@daenzer.net>2013-03-25 18:20:37 +0100
commit33d8408eec806355c2e55726679ec50ef3b769f1 (patch)
treee345ba7d1c71dec7c2068c25d51cff6d2bcc92b2
parentad1d8874fab30257ba8ec8bee8ffa42a8fa9b5c0 (diff)
glamor: Enable by default on SI
We should now handle its major initialization failure cases gracefully. Reviewed-by: Jerome Glisse <jglisse@redhat.com>
-rw-r--r--man/radeon.man2
-rw-r--r--src/radeon_glamor.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/man/radeon.man b/man/radeon.man
index 7de370af..5462e5b4 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 faee5eee..7bca67c5 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")) {