diff options
| author | shaoyunl <[email protected]> | 2022-08-18 18:13:52 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2022-08-22 20:47:09 +0000 |
| commit | 947f63f17e1d91cee19f1bc071e825b28ce4da98 (patch) | |
| tree | bf54ba17f00296213119ae72b69a29625340335a /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | drm/amdgpu: Check num_gfx_rings for gfx v9_0 rb setup. (diff) | |
| download | kernel-947f63f17e1d91cee19f1bc071e825b28ce4da98.tar.gz kernel-947f63f17e1d91cee19f1bc071e825b28ce4da98.zip | |
drm/amdgpu: Remove the additional kfd pre reset call for sriov
The additional call is caused by merge conflict
Reviewed-by: Felix Kuehling <[email protected]>
Signed-off-by: shaoyunl <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -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 4cd87dbb108c..d7eb23b8d692 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -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 |