projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbebaa7
)
drm/amdgpu: cancel late_init_work before gpu reset
author
xinhui pan
<xinhui.pan@amd.com>
Fri, 17 May 2019 02:27:44 +0000
(10:27 +0800)
committer
Alex Deucher
<alexander.deucher@amd.com>
Thu, 6 Jun 2019 03:18:09 +0000
(22:18 -0500)
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>
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 0ffa6733f2b9b2df53f3bcd185568445cfa9d1ed..7a8c2201cd04db1a3cebffd1fd3405522fb4253f 100644
(file)
--- 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);
/*