From 9eb401af05f298ba1e85e3f1e980dc8c826fb31d Mon Sep 17 00:00:00 2001 From: Andreas Boll Date: Fri, 1 Aug 2014 20:05:32 +0200 Subject: [PATCH] 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 Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/radeon_kms.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index c1a206d..eb7164d 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; } -- 2.7.4