[PATCH] drm/scheduler: fix drm_sched_get_cleanup_job

[Russell, Kent]

[AMD Official Use Only - Internal Distribution Only]

It's all good. I pushed a copy to amd-staging-drm-next, reviewed by Andrey. Thanks for pushing it to drm-misc-fixes!

 Kent

> -----Original Message-----
> From: Koenig, Christian <Christian.Koenig at amd.com>
> Sent: Wednesday, April 15, 2020 6:36 AM
> To: Grodzovsky, Andrey <Andrey.Grodzovsky at amd.com>; Russell, Kent
> <Kent.Russell at amd.com>; amd-gfx at lists.freedesktop.org
> Subject: Re: [PATCH] drm/scheduler: fix drm_sched_get_cleanup_job
> 
> Sorry for the holiday/vacation/COVID-19 delay. I've just pushed this patch into
> drm-misc-fixes.
> 
> I assume it already landed in our internal branches?
> 
> Thanks,
> Christian.
> 
> Am 14.04.20 um 16:33 schrieb Andrey Grodzovsky:
> > Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>
> >
> > Andrey
> >
> > On 4/14/20 10:22 AM, Kent Russell wrote:
> >> From: Christian König <christian.koenig at amd.com>
> >>
> >> We are racing to initialize sched->thread here, just always check the
> >> current thread.
> >>
> >> Signed-off-by: Christian Koenig <christian.koenig at amd.com>
> >> Reviewed-by: Kent Russell <kent.russell at amd.com>
> >> ---
> >>   drivers/gpu/drm/scheduler/sched_main.c | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/scheduler/sched_main.c
> >> b/drivers/gpu/drm/scheduler/sched_main.c
> >> index 8e731ed0d9d9..2f319102ae9f 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);