[PATCH 02/31] drm/amdgpu/sdma5.x: suspend KFD queues in ring reset

[Alex Deucher]

SDMA 5.x only supports engine soft reset which resets
all queues on the engine.  As such, we need to suspend
KFD queues around resets like we do for SDMA 4.x.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 7 ++++++-
 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c 
b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index 1813c3ed0aa60..37f4b5b4a098f 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -1543,8 +1543,13 @@ static int sdma_v5_0_reset_queue(struct amdgpu_ring 
*ring, unsigned int vmid)
 {
        struct amdgpu_device *adev = ring->adev;
        u32 inst_id = ring->me;
+       int r;
+
+       amdgpu_amdkfd_suspend(adev, true);
+       r = amdgpu_sdma_reset_engine(adev, inst_id);
+       amdgpu_amdkfd_resume(adev, true);
 
-       return amdgpu_sdma_reset_engine(adev, inst_id);
+       return r;
 }
 
 static int sdma_v5_0_stop_queue(struct amdgpu_ring *ring)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c 
b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index 23f97da628087..0b40411b92a0b 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -1456,8 +1456,13 @@ static int sdma_v5_2_reset_queue(struct amdgpu_ring 
*ring, unsigned int vmid)
 {
        struct amdgpu_device *adev = ring->adev;
        u32 inst_id = ring->me;
+       int r;
+
+       amdgpu_amdkfd_suspend(adev, true);
+       r = amdgpu_sdma_reset_engine(adev, inst_id);
+       amdgpu_amdkfd_resume(adev, true);
 
-       return amdgpu_sdma_reset_engine(adev, inst_id);
+       return r;
 }
 
 static int sdma_v5_2_stop_queue(struct amdgpu_ring *ring)
-- 
2.49.0