From: Christian König <christian.koenig@amd.com>
Date: Sat, 11 Apr 2020 09:54:01 +0000 (+0200)
Subject: drm/scheduler: fix drm_sched_get_cleanup_job
X-Git-Tag: v5.7-rc3~29^2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8623b5255ae7ccaf276aac3920787bf575fa6b37;p=thirdparty%2Fkernel%2Flinux.git

drm/scheduler: fix drm_sched_get_cleanup_job

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/
---

diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index 8e731ed0d9d9f..2f319102ae9f7 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -676,7 +676,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
 	 */
 	if ((sched->timeout != MAX_SCHEDULE_TIMEOUT &&
 	    !cancel_delayed_work(&sched->work_tdr)) ||
-	    __kthread_should_park(sched->thread))
+	    kthread_should_park())
 		return NULL;
 
 	spin_lock(&sched->job_list_lock);