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.greatho...@amd.com>
Change-Id: I9b44dfe59bdd8a38a0342e5155cdb071cf646cc5
---
 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 80393e0583bb..50886de3ba0a 100644
--- 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);
 
-- 
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to