projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next
[linux-block.git]
/
drivers
/
gpu
/
drm
/
scheduler
/
sched_main.c
diff --git
a/drivers/gpu/drm/scheduler/sched_main.c
b/drivers/gpu/drm/scheduler/sched_main.c
index 25a9e691160218542a49c6181378aeb64a53ae3d..d6eaa23ad746b9c9d6ec8357ddabb8f858719b5c 100644
(file)
--- a/
drivers/gpu/drm/scheduler/sched_main.c
+++ b/
drivers/gpu/drm/scheduler/sched_main.c
@@
-678,7
+678,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);