From: Evan Quan Date: Thu, 16 Apr 2020 04:20:38 +0000 (+0800) Subject: drm/amdgpu: correct cancel_delayed_work_sync on gpu reset X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=52fb44cf30fc6b11a2faf8d8d905e756ea24f919;p=linux.git 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 Reviewed-by: Andrey Grodzovsky Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index f66a33410ee87..4be5187391c65 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