diff options
| author | xinhui pan <xinhui.pan@amd.com> | 2019-05-17 10:27:44 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-05 22:18:09 -0500 |
| commit | c53e4db71276bf257b09010935a04bdafddd458e (patch) | |
| tree | a81079362b1faa8210701cc0ad3da1c77cfd59dc /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | fbebaa72992ee14068bfbba51bc55da4aef2c606 (diff) | |
| download | linux-c53e4db71276bf257b09010935a04bdafddd458e.tar.gz linux-c53e4db71276bf257b09010935a04bdafddd458e.tar.bz2 linux-c53e4db71276bf257b09010935a04bdafddd458e.zip | |
drm/amdgpu: cancel late_init_work before gpu reset
gpu reset will run late_init and schedule the late_init_work. if we
keep triggering gpu reset in a short time, there are potenial races.
Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@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 0ffa6733f2b9..7a8c2201cd04 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3593,6 +3593,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, dev_info(adev->dev, "GPU reset begin!\n"); + cancel_delayed_work_sync(&adev->late_init_work); + hive = amdgpu_get_xgmi_hive(adev, false); /* |