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

Merge drm-upstream/drm-next into drm-misc-next

Browse Source 
We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
This commit is contained in:
Gustavo Padovan
2018-06-20 13:22:22 -03:00
parent d67b6a2065 daf0678c20
commit d98c71dadc
1448 changed files with 57646 additions and 24125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/v3d/Kconfig
View File

@@ -3,6 +3,7 @@ config DRM_V3D
depends on ARCH_BCM || ARCH_BCMSTB || COMPILE_TEST
depends on DRM
depends on COMMON_CLK
depends on MMU
select DRM_SCHED
help
Choose this option if you have a system that has a Broadcom

2
drivers/gpu/drm/v3d/v3d_drv.c
View File

@@ -135,7 +135,7 @@ v3d_open(struct drm_device *dev, struct drm_file *file)
drm_sched_entity_init(&v3d->queue[i].sched,
&v3d_priv->sched_entity[i],
&v3d->queue[i].sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL],
32, NULL);
NULL);
}
file->driver_priv = v3d_priv;