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

Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

Change-Id: Id75d6548e8f6b68b6b45081562769629b0bda304
  • Loading branch information
shaoyunl authored and Hawking Zhang committed Aug 19, 2022
1 parent e0f1ff6 commit e92aafd
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 @@ -4467,8 +4467,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 e92aafd

Please sign in to comment.