1 files changed, 35 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1910-drm-amdgpu-Revert-drm-amdgpu-skip-gpu-reset-when-ras.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1910-drm-amdgpu-Revert-drm-amdgpu-skip-gpu-reset-when-ras.patch
new file mode 100644
index 00000000..762207a7
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1910-drm-amdgpu-Revert-drm-amdgpu-skip-gpu-reset-when-ras.patch
@@ -0,0 +1,35 @@
+From 8377498faf18b2a6a924da2c18a293f410809c55 Mon Sep 17 00:00:00 2001
+From: xinhui pan <xinhui.pan@amd.com>
+Date: Wed, 8 May 2019 19:31:06 +0800
+Subject: [PATCH 1910/2940] drm/amdgpu: Revert "drm/amdgpu: skip gpu reset when
+ ras error occured"
+
+This reverts commit 50a634296c335a52d5bfd1cf01c38f7547f6325a.
+
+Signed-off-by: xinhui pan <xinhui.pan@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+index eaef5edefc34..e60a554656ca 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+@@ -187,13 +187,10 @@ int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev);
+ static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev,
+ 		bool is_baco)
+ {
+-	/* remove me when gpu reset works on vega20 A1. */
+-#if 0
+ 	struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
+ 
+ 	if (atomic_cmpxchg(&ras->in_recovery, 0, 1) == 0)
+ 		schedule_work(&ras->recovery_work);
+-#endif
+ 	return 0;
+ }
+ 
+-- 
+2.17.1
+