drm/amdgpu: Remove the additional kfd pre reset call for sriov
authorshaoyunl <shaoyun.liu@amd.com>
Thu, 18 Aug 2022 18:13:52 +0000 (14:13 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 19 Aug 2022 21:06:38 +0000 (17:06 -0400)
The additional call is caused by merge conflict

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 95ce3687902be1311daaae87fc2c0074056f1aa1..f095a2513affc2a58150e9213400e92ab237dadc 100644 (file)
@@ -4415,8 +4415,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
 retry:
        amdgpu_amdkfd_pre_reset(adev);
 
-       amdgpu_amdkfd_pre_reset(adev);
-
        if (from_hypervisor)
                r = amdgpu_virt_request_full_gpu(adev, true);
        else