Skip to content

Commit

Permalink
drm/amdgpu: Remove the additional kfd pre reset call for sriov
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
shaoyunl authored and Alex Deucher committed Aug 22, 2022
1 parent 4bb5fed commit 947f63f
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -4417,8 +4417,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
Expand Down

0 comments on commit 947f63f

Please sign in to comment.