diff options
author | Andreas Boll <andreas.boll.dev@gmail.com> | 2014-08-01 14:05:32 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-08-05 08:53:59 -0400 |
commit | 9eb401af05f298ba1e85e3f1e980dc8c826fb31d (patch) | |
tree | 09d6b67fb54e5d528211bb4f97d9e6e5b4dc1fee | |
parent | 78cd3661fe597dc13b874192994ea6865e7a951c (diff) |
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.c | 10 |
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 | |||
255 | break; | 255 | break; |
256 | case RADEON_INFO_ACCEL_WORKING2: | 256 | case RADEON_INFO_ACCEL_WORKING2: |
257 | if (rdev->family == CHIP_HAWAII) { | 257 | if (rdev->family == CHIP_HAWAII) { |
258 | if (rdev->accel_working) | 258 | if (rdev->accel_working) { |
259 | *value = 2; | 259 | if (rdev->new_fw) |
260 | else | 260 | *value = 3; |
261 | else | ||
262 | *value = 2; | ||
263 | } else { | ||
261 | *value = 0; | 264 | *value = 0; |
265 | } | ||
262 | } else { | 266 | } else { |
263 | *value = rdev->accel_working; | 267 | *value = rdev->accel_working; |
264 | } | 268 | } |