drm/amdkfd: Add Arcturus GWS support and fix VG10

Add support for GWS in Arcturus, which needs MEC2 firmware #48
or above. Fix the MEC2 version check for Vega 10 GWS support,
since Vega 10 firmware adds 0x8000 to the actual firmware
revision. We were previously declaring support where it did not
exist.

Signed-off-by: Joseph Greathouse <Joseph.Greathouse@amd.com>
Reviewed-by: Kent Russell <kent.russell@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 7f6d0958ed62ef4b9e6eb4010f536dbec39584b0..903991e44a8b0419f5db23dc22139a4358d75323 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -602,9 +602,13 @@ static int kfd_gws_init(struct kfd_dev *kfd)
                return 0;
 
        if (hws_gws_support
-               || (kfd->device_info->asic_family >= CHIP_VEGA10
+               || (kfd->device_info->asic_family == CHIP_VEGA10
+                       && kfd->mec2_fw_version >= 0x81b3)
+               || (kfd->device_info->asic_family >= CHIP_VEGA12
                        && kfd->device_info->asic_family <= CHIP_RAVEN
-                       && kfd->mec2_fw_version >= 0x1b3))
+                       && kfd->mec2_fw_version >= 0x1b3)
+               || (kfd->device_info->asic_family == CHIP_ARCTURUS
+                       && kfd->mec2_fw_version >= 0x30))
                ret = amdgpu_amdkfd_alloc_gws(kfd->kgd,
                                amdgpu_amdkfd_get_num_gws(kfd->kgd), &kfd->gws);