summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2014-08-01 21:55:40 +0200
committerAlex Deucher <alexander.deucher@amd.com>2014-08-12 11:33:33 -0400
commit94202cbfbca05a503acdc1cca2f8409d141173af (patch)
tree44962bbc78a9745132acc4e220df99cb29b0eeeb
parent03930edd49f6b8a8d79910c7be5408b47db9649b (diff)
radeon: enable hawaii accel conditionally (v3)
Only if the kernel has the new CP firmware. v2: check value of ACCEL_WORKING2 v3 (Andreas Boll): - check for value 2 or 3 of ACCEL_WORKING2 - update man page Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (v2) Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
-rw-r--r--man/radeon.man3
-rw-r--r--src/radeon_kms.c9
2 files changed, 7 insertions, 5 deletions
diff --git a/man/radeon.man b/man/radeon.man
index 802f6c2f..7dde0400 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -229,8 +229,7 @@ Selects software cursor. The default is
Enables or disables all hardware acceleration.
.br
The default is
-.B on
-except for HAWAII.
+.B on.
.TP
.BI "Option \*qZaphodHeads\*q \*q" string \*q
Specify the RandR output(s) to use with zaphod mode for a particular driver
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index a5e77ef0..171d919c 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -387,8 +387,12 @@ static Bool RADEONIsAccelWorking(ScrnInfoPtr pScrn)
}
return FALSE;
}
- if (tmp)
+ if (info->ChipFamily == CHIP_FAMILY_HAWAII) {
+ if (tmp == 2 || tmp == 3)
+ return TRUE;
+ } else if (tmp) {
return TRUE;
+ }
return FALSE;
}
@@ -486,8 +490,7 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
info->is_fast_fb = TRUE;
}
- if (!xf86ReturnOptValBool(info->Options, OPTION_ACCEL,
- info->ChipFamily != CHIP_FAMILY_HAWAII) ||
+ if (!xf86ReturnOptValBool(info->Options, OPTION_ACCEL, TRUE) ||
(!RADEONIsAccelWorking(pScrn))) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"GPU accel disabled or not working, using shadowfb for KMS\n");