1 files changed, 29 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3209-drm-amdgpu-Reenable-manual-GPU-reset-from-sysfs.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3209-drm-amdgpu-Reenable-manual-GPU-reset-from-sysfs.patch
new file mode 100644
index 00000000..dcfbc94d
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3209-drm-amdgpu-Reenable-manual-GPU-reset-from-sysfs.patch
@@ -0,0 +1,29 @@
+From 8045c07e55d8317baafe783a1bf2ae2494a05291 Mon Sep 17 00:00:00 2001
+From: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
+Date: Fri, 19 Jan 2018 17:23:08 -0500
+Subject: [PATCH 3209/4131] drm/amdgpu: Reenable manual GPU reset from sysfs
+
+Otherwise it keeps rejecting the reset.
+
+Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index fd4cb2d..1874b50 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -2650,7 +2650,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
+         uint64_t reset_flags = 0;
+         int i, r, resched;
+ 
+-	if (!amdgpu_device_ip_check_soft_reset(adev)) {
++	if (!force && !amdgpu_device_ip_check_soft_reset(adev)) {
+                 DRM_INFO("No hardware hang detected. Did some blocks stall?\n");
+                 return 0;
+         }
+-- 
+2.7.4
+