1 files changed, 30 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1987-drm-amdgpu-cancel-late_init_work-before-gpu-reset.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1987-drm-amdgpu-cancel-late_init_work-before-gpu-reset.patch
new file mode 100644
index 00000000..527ea9ad
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1987-drm-amdgpu-cancel-late_init_work-before-gpu-reset.patch
@@ -0,0 +1,30 @@
+From 7de46e94c265c7acdaef31e0be05fecbe86d7a5c Mon Sep 17 00:00:00 2001
+From: xinhui pan <xinhui.pan@amd.com>
+Date: Fri, 17 May 2019 10:27:44 +0800
+Subject: [PATCH 1987/2940] 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>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index 94d4df915f5e..c10519a1330e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -3639,6 +3639,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);
+ 
+ 	/*
+-- 
+2.17.1
+