5.6-stable patches

added patches:
	drm-scheduler-fix-drm_sched_get_cleanup_job.patch

diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/queue-5.6/drm-scheduler-fix-drm_sched_get_cleanup_job.patch b/queue-5.6/drm-scheduler-fix-drm_sched_get_cleanup_job.patch
new file mode 100644 (file)
index 0000000..db232c0
--- /dev/null
+++ b/queue-5.6/drm-scheduler-fix-drm_sched_get_cleanup_job.patch
@@ -0,0 +1,37 @@
+From 8623b5255ae7ccaf276aac3920787bf575fa6b37 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Sat, 11 Apr 2020 11:54:01 +0200
+Subject: drm/scheduler: fix drm_sched_get_cleanup_job
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Christian König <christian.koenig@amd.com>
+
+commit 8623b5255ae7ccaf276aac3920787bf575fa6b37 upstream.
+
+We are racing to initialize sched->thread here, just always check the
+current thread.
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
+Reviewed-by: Kent Russell <kent.russell@amd.com>
+Link: https://patchwork.freedesktop.org/patch/361303/
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/scheduler/sched_main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/scheduler/sched_main.c
++++ b/drivers/gpu/drm/scheduler/sched_main.c
+@@ -687,7 +687,7 @@ drm_sched_get_cleanup_job(struct drm_gpu
+        */
+       if ((sched->timeout != MAX_SCHEDULE_TIMEOUT &&
+           !cancel_delayed_work(&sched->work_tdr)) ||
+-          __kthread_should_park(sched->thread))
++          kthread_should_park())
+               return NULL;
+ 
+       spin_lock_irqsave(&sched->job_list_lock, flags);

diff --git a/queue-5.6/series b/queue-5.6/series
new file mode 100644 (file)
index 0000000..57cfb19
--- /dev/null
+++ b/queue-5.6/series
@@ -0,0 +1 @@
+drm-scheduler-fix-drm_sched_get_cleanup_job.patch