3 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 66cdd89982c9..94547bd3bfce 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2351,6 +2351,7 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)
         struct amdgpu_ring *ring;
         struct dma_fence *fence = NULL, *next = NULL;
 
+        mutex_lock(&adev->virt.lock_reset);
         atomic_inc(&adev->gpu_reset_counter);
 
         /* block TTM */
@@ -2436,6 +2437,7 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)
                 dev_info(adev->dev, "GPU reset failed\n");
         }
 
+        mutex_unlock(&adev->virt.lock_reset);
         return r;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index 1fc48e1690ff..2feb9aa3b1f4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -98,6 +98,7 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)
         adev->enable_virtual_display = true;
 
         mutex_init(&adev->virt.lock_kiq);
+        mutex_init(&adev->virt.lock_reset);
 }
 
 uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
index 7020ff22b9b5..4b05568bff00 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
@@ -47,6 +47,7 @@ struct amdgpu_virt {
         bool chained_ib_support;
         uint32_t                        reg_val_offs;
         struct mutex                    lock_kiq;
+        struct mutex                    lock_reset;
         struct amdgpu_irq_src           ack_irq;
         struct amdgpu_irq_src           rcv_irq;
         struct delayed_work             flr_work;