diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-04-24 10:13:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-04-24 10:14:04 +1000 |
| commit | e32b2484b3e00170b6cf57d99a18972e174e10ea (patch) | |
| tree | 49900d2b140812d5cfeecb77c4746b65590641df /drivers/gpu/drm/scheduler/sched_main.c | |
| parent | 11c5ec788b454609e60c78b0b6b24da8dae62931 (diff) | |
| parent | 9da67433f64eb89e5a7b47977507806c6ea026e7 (diff) | |
Merge tag 'drm-misc-fixes-2020-04-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
A few resources-related fixes (tidss, dp_mst, scheduler), probe fixes and
DT bindings adjustments.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200423103224.7hvyr3v7dmuny2bz@gilmour.lan
Diffstat (limited to 'drivers/gpu/drm/scheduler/sched_main.c')
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |