From 33d8408eec806355c2e55726679ec50ef3b769f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 12 Mar 2013 19:03:06 +0100 Subject: [PATCH] glamor: Enable by default on SI We should now handle its major initialization failure cases gracefully. Reviewed-by: Jerome Glisse --- 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 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")) {