projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2f63ee
)
drm/amdgpu: correct cancel_delayed_work_sync on gpu reset
author
Evan Quan
<evan.quan@amd.com>
Thu, 16 Apr 2020 04:20:38 +0000
(12:20 +0800)
committer
Alex Deucher
<alexander.deucher@amd.com>
Wed, 22 Apr 2020 22:11:49 +0000
(18:11 -0400)
As for XGMI setup, it should be performed on other devices
from the hive also.
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@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 f66a33410ee8784f744039d51f9a85edfb91783b..4be5187391c65a0028996e893506333e57346bf3 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@
-4218,6
+4218,8
@@
int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
amdgpu_amdkfd_pre_reset(tmp_adev);
}
+ cancel_delayed_work_sync(&tmp_adev->delayed_init_work);
+
/*
* Mark these ASICs to be reseted as untracked first
* And add them back after reset completed