diff options
| author | Evan Quan <evan.quan@amd.com> | 2020-04-16 12:20:38 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-04-22 18:11:49 -0400 |
| commit | 52fb44cf30fc6b11a2faf8d8d905e756ea24f919 (patch) | |
| tree | bfb3fe48dee8ac7abccf68898df4837a2ccdc241 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | a2f63ee8b5eabda8b317425d1e487e51a4d7b21e (diff) | |
| download | kernel_replicant_linux-52fb44cf30fc6b11a2faf8d8d905e756ea24f919.tar.gz kernel_replicant_linux-52fb44cf30fc6b11a2faf8d8d905e756ea24f919.tar.bz2 kernel_replicant_linux-52fb44cf30fc6b11a2faf8d8d905e756ea24f919.zip | |
drm/amdgpu: correct cancel_delayed_work_sync on gpu reset
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>
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, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index f66a33410ee8..4be5187391c6 100644 --- 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 |