1 files changed, 33 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1990-drm-amdgpu-soc15-skip-reset-on-init.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1990-drm-amdgpu-soc15-skip-reset-on-init.patch
new file mode 100644
index 00000000..2af69616
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1990-drm-amdgpu-soc15-skip-reset-on-init.patch
@@ -0,0 +1,33 @@
+From f7826508fb7124e4283cc22f7720d86b71bcf3de Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 17 May 2019 09:21:13 -0500
+Subject: [PATCH 1990/2940] drm/amdgpu/soc15: skip reset on init
+
+Not necessary on soc15 and breaks driver reload on server cards.
+
+Acked-by: Amber Lin <Amber.Lin@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+---
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
+index 75524caff362..55c307aea3b6 100644
+--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
+@@ -761,6 +761,11 @@ static bool soc15_need_reset_on_init(struct amdgpu_device *adev)
+ {
+ 	u32 sol_reg;
+ 
++	/* Just return false for soc15 GPUs.  Reset does not seem to
++	 * be necessary.
++	 */
++	return false;
++
+ 	if (adev->flags & AMD_IS_APU)
+ 		return false;
+ 
+-- 
+2.17.1
+