drm/amdgpu: kfd_pre_reset outside req_full_gpu cause sriov hang

XGMI hive put kfd_pre_reset into amdgpu_device_lock_adev,
but outside req_full_gpu of sriov.
It would make sriov hang during reset.

Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
Reviewed-by: Shaoyun Liu <Shaoyun.Liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index b60afeade50a..8a078f4ae73d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3476,14 +3476,16 @@ static void amdgpu_device_lock_adev(struct amdgpu_device *adev)
         mutex_lock(&adev->lock_reset);
         atomic_inc(&adev->gpu_reset_counter);
         adev->in_gpu_reset = 1;
-        /* Block kfd */
-        amdgpu_amdkfd_pre_reset(adev);
+        /* Block kfd: SRIOV would do it separately */
+        if (!amdgpu_sriov_vf(adev))
+                amdgpu_amdkfd_pre_reset(adev);
 }
 
 static void amdgpu_device_unlock_adev(struct amdgpu_device *adev)
 {
-        /*unlock kfd */
-        amdgpu_amdkfd_post_reset(adev);
+        /*unlock kfd: SRIOV would do it separately */
+        if (!amdgpu_sriov_vf(adev))
+                amdgpu_amdkfd_post_reset(adev);
         amdgpu_vf_error_trans_all(adev);
         adev->in_gpu_reset = 0;
         mutex_unlock(&adev->lock_reset);