lkml.org 
[lkml]   [2020]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 23/79] drm/scheduler: fix drm_sched_get_cleanup_job
    Date
    From: Christian König <christian.koenig@amd.com>

    [ Upstream commit 8623b5255ae7ccaf276aac3920787bf575fa6b37 ]

    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/
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 60c4c6a1aac68..75737ec596141 100644
    --- 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_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_irqsave(&sched->job_list_lock, flags);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-30 16:12    [W:4.071 / U:0.648 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site