projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4bb5fed
)
drm/amdgpu: Remove the additional kfd pre reset call for sriov
author
shaoyunl
<shaoyun.liu@amd.com>
Thu, 18 Aug 2022 18:13:52 +0000
(14:13 -0400)
committer
Alex Deucher
<alexander.deucher@amd.com>
Mon, 22 Aug 2022 20:47:09 +0000
(16:47 -0400)
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>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 4cd87dbb108c083b0f4671a40df9bd5aa24d4830..d7eb23b8d692a99d10edb87c89150042e79a3fdd 100644
(file)
--- 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