1 files changed, 42 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0661-drm-amdgpu-Fix-skipping-hangged-job-reset-during-gpu.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0661-drm-amdgpu-Fix-skipping-hangged-job-reset-during-gpu.patch
new file mode 100644
index 00000000..24c63573
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0661-drm-amdgpu-Fix-skipping-hangged-job-reset-during-gpu.patch
@@ -0,0 +1,42 @@
+From e7e0f8294e73c493ee3df01c8792953124b118c2 Mon Sep 17 00:00:00 2001
+From: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
+Date: Wed, 31 Oct 2018 10:23:05 -0400
+Subject: [PATCH 0661/2940] drm/amdgpu: Fix skipping hangged job reset during
+ gpu recover.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem:
+During GPU recover DAL would hang in
+amdgpu_pm_compute_clocks->amdgpu_fence_wait_empty
+
+Fix:
+Turns out there was a typo introduced by
+3320b8d drm/amdgpu: remove job->ring which caused skipping
+amdgpu_fence_driver_force_completion and so the hangged job
+was never force signaled and this would cause the hang later in DAL.
+
+Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@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_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 8f456a050267..73dedfa902ee 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -3390,7 +3390,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
+ 
+ 		kthread_park(ring->sched.thread);
+ 
+-		if (job && job->base.sched == &ring->sched)
++		if (job && job->base.sched != &ring->sched)
+ 			continue;
+ 
+ 		drm_sched_hw_job_reset(&ring->sched, job ? &job->base : NULL);
+-- 
+2.17.1
+