1 files changed, 36 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0919-drm-amdgpu-Skip-ring-soft-recovery-when-fence-was-NU.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0919-drm-amdgpu-Skip-ring-soft-recovery-when-fence-was-NU.patch
new file mode 100644
index 00000000..e1401847
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0919-drm-amdgpu-Skip-ring-soft-recovery-when-fence-was-NU.patch
@@ -0,0 +1,36 @@
+From dc956dfc2832d5308ab23fa7f73b00aa55a1a8fb Mon Sep 17 00:00:00 2001
+From: wentalou <Wentao.Lou@amd.com>
+Date: Thu, 6 Dec 2018 10:29:52 +0800
+Subject: [PATCH 0919/2940] drm/amdgpu: Skip ring soft recovery when fence was
+ NULL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+amdgpu_ring_soft_recovery would have Call-Trace,
+when s_fence->parent was NULL inside amdgpu_job_timedout.
+Check fence first, as drm_sched_hw_job_reset did.
+
+Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+index 5b75bdc8dc28..335a0edf114b 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+@@ -397,7 +397,7 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid,
+ {
+ 	ktime_t deadline = ktime_add_us(ktime_get(), 10000);
+ 
+-	if (!ring->funcs->soft_recovery)
++	if (!ring->funcs->soft_recovery || !fence)
+ 		return false;
+ 
+ 	atomic_inc(&ring->adev->gpu_reset_counter);
+-- 
+2.17.1
+