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

Merge v5.6-rc2 into drm-misc-next

Browse Source 
Lyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-next
forward yet, so it looks like a good occasion.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
This commit is contained in:
Maxime Ripard
2020-02-17 10:34:34 +01:00
parent 3e8a3844fe 11a48a5a18
commit 28f2aff1ca
10621 changed files with 504920 additions and 212768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/lima/lima_sched.c
View File

@@ -159,9 +159,10 @@ int lima_sched_context_init(struct lima_sched_pipe *pipe,
struct lima_sched_context *context,
atomic_t *guilty)
{
struct drm_sched_rq *rq = pipe->base.sched_rq + DRM_SCHED_PRIORITY_NORMAL;
struct drm_gpu_scheduler *sched = &pipe->base;
return drm_sched_entity_init(&context->base, &rq, 1, guilty);
return drm_sched_entity_init(&context->base, DRM_SCHED_PRIORITY_NORMAL,
&sched, 1, guilty);
}
void lima_sched_context_fini(struct lima_sched_pipe *pipe,