summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-09-24 11:35:00 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-11-13 11:36:51 -0500
commite38a92e00d015a6b80a1f3a16d58c61f084b066f (patch)
tree3f7383959ddd0788e07e261eb45f5edb9a2aa04a
parente4cd0f4392ea11c93088ad429f36eaaf9bcbf505 (diff)
radeon: add support for Hawaii
Disabled by default until the acceleration code stablizes. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--man/radeon.man3
-rw-r--r--src/radeon_kms.c3
-rw-r--r--src/radeon_probe.h1
3 files changed, 6 insertions, 1 deletions
diff --git a/man/radeon.man b/man/radeon.man
index b642e456..1363d8b4 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -205,6 +205,9 @@ KAVERI APUs
.TP 12
.B KABINI
KABINI APUs
+.TP 12
+.B HAWAII
+Radeon R9 series
.PD
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 5b85acc3..44a0139f 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -489,7 +489,8 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
info->is_fast_fb = TRUE;
}
- if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE) ||
+ if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL,
+ info->ChipFamily == CHIP_FAMILY_HAWAII) ||
(!RADEONIsAccelWorking(pScrn))) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"GPU accel disabled or not working, using shadowfb for KMS\n");
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index de0135d9..cea66956 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -110,6 +110,7 @@ typedef enum {
CHIP_FAMILY_BONAIRE,
CHIP_FAMILY_KAVERI,
CHIP_FAMILY_KABINI,
+ CHIP_FAMILY_HAWAII,
CHIP_FAMILY_LAST
} RADEONChipFamily;