diff options
| author | shaoyunl <shaoyun.liu@amd.com> | 2022-08-18 14:13:52 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2022-08-19 17:06:38 -0400 |
| commit | 06671734881af2bcf7f453661b5f8616e32bb3fc (patch) | |
| tree | cc0bf3b334ae03465e25fe2170ac21380fb5b5d2 /drivers | |
| parent | c351938350ab9b5e978dede2c321da43de7eb70c (diff) | |
| download | lwn-06671734881af2bcf7f453661b5f8616e32bb3fc.tar.gz lwn-06671734881af2bcf7f453661b5f8616e32bb3fc.zip | |
drm/amdgpu: Remove the additional kfd pre reset call for sriov
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 |
1 files changed, 0 insertions, 2 deletions
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 |