xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Browse Source 
Some conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
This commit is contained in:
Maarten Lankhorst
2020-06-29 12:15:51 +02:00
parent 84e543bc9d 0a19b068ac
commit 60e9eabf41
15144 changed files with 872568 additions and 325352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/scheduler/sched_main.c
View File

@@ -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);