[PATCH] drm/amdkfd: enable heavy-weight TLB flush on Arcturus

[Eric Huang]

SDMA FW fixes the hang issue for adding heavy-weight TLB
flush on Arcturus, so we can enable it.

Signed-off-by: Eric Huang <jinhuieric.hu...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 9 ++++++---
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c         | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index a64cbbd943ba..f1fed0fc31d3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1892,10 +1892,13 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
                                true);
        ret = unreserve_bo_and_vms(&ctx, false, false);
 
-       /* Only apply no TLB flush on Aldebaran to
-        * workaround regressions on other Asics.
+       /* Only apply no TLB flush on Aldebaran and Arcturus
+        * to workaround regressions on other Asics.
         */
-       if (table_freed && (adev->asic_type != CHIP_ALDEBARAN))
+       if (table_freed &&
+           (adev->asic_type != CHIP_ALDEBARAN) &&
+           (adev->asic_type != CHIP_ARCTURUS ||
+            adev->sdma.instance[0].fw_version < 18))
                *table_freed = true;
 
        goto out;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index b570c0454ce9..0e4a76dca809 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1806,7 +1806,9 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file 
*filep,
        }
        mutex_unlock(&p->mutex);
 
-       if (KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 2)) {
+       if (KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 2) ||
+           (KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 1) &&
+            dev->adev->sdma.instance[0].fw_version >= 18)) {
                err = amdgpu_amdkfd_gpuvm_sync_memory(dev->adev,
                                (struct kgd_mem *) mem, true);
                if (err) {
-- 
2.25.1