2 files changed, 11 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 4a2b9a37271d..e4e781658cf1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -881,6 +881,7 @@ struct amdgpu_vm_id {
         struct fence            *first;
         struct amdgpu_sync      active;
         struct fence            *last_flush;
+        struct amdgpu_ring      *last_user;
         atomic_long_t           owner;
 
         uint64_t                pd_gpu_addr;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 1425aab31233..2aff938f94c6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -260,6 +260,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
         id->pd_gpu_addr = pd_addr;
 
         list_move_tail(&id->list, &adev->vm_manager.ids_lru);
+        id->last_user = ring;
         atomic_long_set(&id->owner, (long)vm);
         vm->ids[ring->idx] = id;
 
@@ -307,13 +308,17 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring,
 
                 trace_amdgpu_vm_flush(pd_addr, ring->idx, vm_id);
                 amdgpu_ring_emit_vm_flush(ring, vm_id, pd_addr);
-                r = amdgpu_fence_emit(ring, &fence);
-                if (r)
-                        return r;
 
                 mutex_lock(&adev->vm_manager.lock);
-                fence_put(id->last_flush);
-                id->last_flush = fence;
+                if ((id->pd_gpu_addr == pd_addr) && (id->last_user == ring)) {
+                        r = amdgpu_fence_emit(ring, &fence);
+                        if (r) {
+                                mutex_unlock(&adev->vm_manager.lock);
+                                return r;
+                        }
+                        fence_put(id->last_flush);
+                        id->last_flush = fence;
+                }
                 mutex_unlock(&adev->vm_manager.lock);
         }