1 files changed, 38 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2161-drm-amd-scheduler-fix-page-protection-of-cb.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2161-drm-amd-scheduler-fix-page-protection-of-cb.patch
new file mode 100644
index 00000000..3571bf20
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2161-drm-amd-scheduler-fix-page-protection-of-cb.patch
@@ -0,0 +1,38 @@
+From a011ca7e37fbd869f0f1b91049d3b66c7aa0df4a Mon Sep 17 00:00:00 2001
+From: Chunming Zhou <david1.zhou@amd.com>
+Date: Tue, 7 Nov 2017 10:40:00 +0800
+Subject: [PATCH 2161/4131] drm/amd/scheduler: fix page protection of cb
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We must remove the fence callback.
+
+Change-Id: I5d58a3a43b82fefd6c211c4128b0c9187c191e7f
+Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
+Reviewed-by: Christian König <christian.koenig@amd.com>
+---
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+index 537b296..57c1a3b 100644
+--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
++++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+@@ -229,6 +229,13 @@ void amd_sched_entity_fini(struct amd_gpu_scheduler *sched,
+ 		 */
+ 		kthread_park(sched->thread);
+ 		kthread_unpark(sched->thread);
++		if (entity->dependency) {
++			dma_fence_remove_callback(entity->dependency,
++							&entity->cb);
++			dma_fence_put(entity->dependency);
++			entity->dependency = NULL;
++		}
++
+ 		while ((job = to_amd_sched_job(spsc_queue_pop(&entity->job_queue)))) {
+ 			struct amd_sched_fence *s_fence = job->s_fence;
+ 
+-- 
+2.7.4
+