1 files changed, 43 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3986-drm-amdgpu-use-new-asic-need_full_reset-callback.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3986-drm-amdgpu-use-new-asic-need_full_reset-callback.patch
new file mode 100644
index 00000000..5b32bb91
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3986-drm-amdgpu-use-new-asic-need_full_reset-callback.patch
@@ -0,0 +1,43 @@
+From 35d2833e4b01663c2395220b1d22f5b0b5e91d73 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 29 Mar 2018 14:48:37 -0500
+Subject: [PATCH 3986/4131] drm/amdgpu: use new asic need_full_reset callback
+
+Use the new callback to determine whether to use full
+asic reset or per IP soft reset.  Enables reset to
+actually proceed on asics which don't support soft
+reset yet.
+
+Reviewed-by: Huang Rui <ray.huang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index 17ce3ad..ce8c5ee 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -2791,6 +2791,9 @@ static bool amdgpu_device_ip_check_soft_reset(struct amdgpu_device *adev)
+ 	if (amdgpu_sriov_vf(adev))
+ 		return true;
+ 
++	if (amdgpu_asic_need_full_reset(adev))
++		return true;
++
+ 	for (i = 0; i < adev->num_ip_blocks; i++) {
+ 		if (!adev->ip_blocks[i].status.valid)
+ 			continue;
+@@ -2847,6 +2850,9 @@ static bool amdgpu_device_ip_need_full_reset(struct amdgpu_device *adev)
+ {
+ 	int i;
+ 
++	if (amdgpu_asic_need_full_reset(adev))
++		return true;
++
+ 	for (i = 0; i < adev->num_ip_blocks; i++) {
+ 		if (!adev->ip_blocks[i].status.valid)
+ 			continue;
+-- 
+2.7.4
+