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

Merge v5.0-rc7 into drm-next

Browse Source 
Backmerging for nouveau and imx that needed some fixes for next pulls.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2019-02-18 13:27:15 +10:00
parent 8d451a4b6e a3b22b9f11
commit c06de56121
1765 changed files with 18740 additions and 9480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/scheduler/sched_entity.c
View File

@@ -440,13 +440,10 @@ struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity)
while ((entity->dependency =
sched->ops->dependency(sched_job, entity))) {
trace_drm_sched_job_wait_dep(sched_job, entity->dependency);
if (drm_sched_entity_add_dependency_cb(entity)) {
trace_drm_sched_job_wait_dep(sched_job,
entity->dependency);
if (drm_sched_entity_add_dependency_cb(entity))
return NULL;
}
}
/* skip jobs from entity that marked guilty */