diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2014-08-01 21:55:40 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-08-12 11:33:33 -0400 |
| commit | 94202cbfbca05a503acdc1cca2f8409d141173af (patch) | |
| tree | 44962bbc78a9745132acc4e220df99cb29b0eeeb /src | |
| parent | 03930edd49f6b8a8d79910c7be5408b47db9649b (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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_kms.c | 9 |
1 files changed, 6 insertions, 3 deletions
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"); |