For non-MI parts, move TBA/TMA back to system memory.
Results in GPU resets in some apps after suspend.

v2: add additional IP versions

Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/6116
Fixes: fe5966d4fdcb ("drm/amdkfd: move TBA/TMA from system to device memory")
Cc: James Zhu <[email protected]>
Cc: Vladimir Indic <[email protected]>
Cc: Harish Kasiviswanathan <[email protected]>
Cc: Philip Yang <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
---
 drivers/gpu/drm/amd/amdkfd/kfd_process.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 546721b4d59ac..b1b641ddbcf68 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -1554,7 +1554,12 @@ static int kfd_process_device_init_cwsr_dgpu(struct 
kfd_process_device *pdd)
        if (!dev->kfd->cwsr_enabled || !iosys_map_is_null(&qpd->cwsr_map) || 
!qpd->cwsr_base)
                return 0;
 
-       if (KFD_GC_VERSION(dev) >= IP_VERSION(9, 4, 2) && 
!dev->adev->apu_prefer_gtt)
+       if ((KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 2) ||
+            KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 3) ||
+            KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 4) ||
+            KFD_GC_VERSION(dev) == IP_VERSION(9, 5, 0) ||
+            KFD_GC_VERSION(dev) == IP_VERSION(12, 1, 0)) &&
+           !dev->adev->apu_prefer_gtt)
                flags |= KFD_IOC_ALLOC_MEM_FLAGS_VRAM;
        else
                flags |= KFD_IOC_ALLOC_MEM_FLAGS_GTT;
-- 
2.56.0

Reply via email to