drm/radeon: tweak ACCEL_WORKING2 query for hawaii

Return 2 so we can be sure the kernel has the necessary
changes for acceleration to work.

Note: This patch depends on these two commits:
 - drm/radeon: fix cut and paste issue for hawaii.
 - drm/radeon: use packet2 for nop on hawaii with old firmware

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
Cc: stable@vger.kernel.org

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index d25ae6acfd5a..c1a206dd859d 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -254,7 +254,14 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                 }
                 break;
         case RADEON_INFO_ACCEL_WORKING2:
-                *value = rdev->accel_working;
+                if (rdev->family == CHIP_HAWAII) {
+                        if (rdev->accel_working)
+                                *value = 2;
+                        else
+                                *value = 0;
+                } else {
+                        *value = rdev->accel_working;
+                }
                 break;
         case RADEON_INFO_TILING_CONFIG:
                 if (rdev->family >= CHIP_BONAIRE)