From: shaoyunl Date: Thu, 18 Aug 2022 18:13:52 +0000 (-0400) Subject: drm/amdgpu: Remove the additional kfd pre reset call for sriov X-Git-Tag: v6.1-rc5~532^2^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06671734881af2bcf7f453661b5f8616e32bb3fc;p=platform%2Fkernel%2Flinux-starfive.git drm/amdgpu: Remove the additional kfd pre reset call for sriov The additional call is caused by merge conflict Reviewed-by: Felix Kuehling Signed-off-by: shaoyunl Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 95ce3687902b..f095a2513aff 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -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