summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Boll <andreas.boll.dev@gmail.com>2014-08-01 22:05:32 +0400
committerAlex Deucher <alexander.deucher@amd.com>2014-08-05 16:53:59 +0400
commit9eb401af05f298ba1e85e3f1e980dc8c826fb31d (patch)
tree09d6b67fb54e5d528211bb4f97d9e6e5b4dc1fee
parent78cd3661fe597dc13b874192994ea6865e7a951c (diff)
downloadlinux-9eb401af05f298ba1e85e3f1e980dc8c826fb31d.tar.xz
drm/radeon: tweak ACCEL_WORKING2 query for the new firmware for hawaii
Adjust the previous tweak for hawaii to return 3 if the new firmware is used. Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_kms.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index c1a206dd859d..eb7164d07985 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -255,10 +255,14 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file
break;
case RADEON_INFO_ACCEL_WORKING2:
if (rdev->family == CHIP_HAWAII) {
- if (rdev->accel_working)
- *value = 2;
- else
+ if (rdev->accel_working) {
+ if (rdev->new_fw)
+ *value = 3;
+ else
+ *value = 2;
+ } else {
*value = 0;
+ }
} else {
*value = rdev->accel_working;
}