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>

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index c1a206dd859d086f5e583e6f8609b3a593a0f974..eb7164d07985668a7c698a44d4d2e9e29668dfb8 100644 (file)
--- 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;
                }