diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-06 21:28:13 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-06 21:28:13 +0200 |
commit | bb72f31ae1d6a54ca16b83a9eddfda20a8947e43 (patch) | |
tree | 5604947185b9b5954c15793b7ab7b9cca9ee35a4 /drm-scheduler-fix-drm_sched_get_cleanup_job.patch | |
parent | 9d4450dcddccc8b0ede90188bdd1ac2f5983b7f4 (diff) | |
parent | b149e37827a98571e97acc65ad3916bbf13dfc50 (diff) | |
download | kernel-bb72f31ae1d6a54ca16b83a9eddfda20a8947e43.tar.gz kernel-bb72f31ae1d6a54ca16b83a9eddfda20a8947e43.tar.xz kernel-bb72f31ae1d6a54ca16b83a9eddfda20a8947e43.zip |
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
Diffstat (limited to 'drm-scheduler-fix-drm_sched_get_cleanup_job.patch')
-rw-r--r-- | drm-scheduler-fix-drm_sched_get_cleanup_job.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/drm-scheduler-fix-drm_sched_get_cleanup_job.patch b/drm-scheduler-fix-drm_sched_get_cleanup_job.patch deleted file mode 100644 index db232c0cd..000000000 --- a/drm-scheduler-fix-drm_sched_get_cleanup_job.patch +++ /dev/null @@ -1,37 +0,0 @@ -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); |