drm/amdgpu: switch the GDS only on demand v2

Switching the GDS space to often seems to be problematic.

This patch together with the following can avoid VM faults on context switch.

v2: extend commit message a bit

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
Reviewed-by: Chunming Zhou <david1.zhou@amd.com> (v1)

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index e63e57e51db7..798d46626820 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -165,6 +165,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
 
                 if (ib->ctx != ctx || ib->vm != vm) {
                         ring->current_ctx = old_ctx;
+                        if (ib->vm_id)
+                                amdgpu_vm_reset_id(adev, ib->vm_id);
                         amdgpu_ring_undo(ring);
                         return -EINVAL;
                 }
@@ -181,6 +183,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         if (r) {
                 dev_err(adev->dev, "failed to emit fence (%d)\n", r);
                 ring->current_ctx = old_ctx;
+                if (ib->vm_id)
+                        amdgpu_vm_reset_id(adev, ib->vm_id);
                 amdgpu_ring_undo(ring);
                 return r;
         }