[PATCH 30/42] drm/amdgpu/gfx11: unmap the queue via MES on reset for MMIO path

[Alex Deucher]

To keep MES in sync.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 1dd35aa6199d3..455fe4b3c2055 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -6790,6 +6790,10 @@ static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring,
                return r;
 
        if (use_mmio) {
+               r = amdgpu_mes_unmap_legacy_queue(adev, ring,
+                                                 RESET_QUEUES, 0, 0, 0);
+               if (r)
+                       return r;
                amdgpu_gfx_mqd_reset_restore(ring);
 
                r = amdgpu_mes_map_legacy_queue(adev, ring, 0);
@@ -6817,6 +6821,10 @@ static int gfx_v11_0_reset_kcq(struct amdgpu_ring *ring,
                return r;
 
        if (use_mmio) {
+               r = amdgpu_mes_unmap_legacy_queue(adev, ring,
+                                                 RESET_QUEUES, 0, 0, 0);
+               if (r)
+                       return r;
                amdgpu_gfx_mqd_reset_restore(ring);
 
                r = amdgpu_mes_map_legacy_queue(adev, ring, 0);
-- 
2.54.0