2 files changed, 5 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 7df1f486f1fb..0c8be665ca2c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -897,6 +897,8 @@ struct amdgpu_vm_id {
         /* last flushed PD/PT update */
         struct fence            *flushed_updates;
 
+        uint32_t                current_gpu_reset_count;
+
         uint32_t                gds_base;
         uint32_t                gds_size;
         uint32_t                gws_base;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index ea10b7af33df..be0941621f4d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -255,6 +255,8 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
                 /* Check all the prerequisites to using this VMID */
                 if (!id)
                         continue;
+                if (id->current_gpu_reset_count != atomic_read(&adev->gpu_reset_counter))
+                        continue;
 
                 if (atomic64_read(&id->owner) != vm->client_id)
                         continue;
@@ -278,6 +280,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
                 if (r)
                         goto error;
 
+                id->current_gpu_reset_count = atomic_read(&adev->gpu_reset_counter);
                 list_move_tail(&id->list, &adev->vm_manager.ids_lru);
                 vm->ids[ring->idx] = id;