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

Merge v4.18-rc3 into drm-next

Browse Source 
Two requests have come in for a backmerge,
and I've got some pull reqs on rc2, so this
just makes sense.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2018-07-04 10:27:12 +10:00
parent eab9766931 021c91791a
commit f29135ee4e
702 changed files with 6957 additions and 3732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
View File

@@ -830,7 +830,7 @@ static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane)
return ret;
}
if (desc->layout.xstride && desc->layout.pstride) {
if (desc->layout.xstride[0] && desc->layout.pstride[0]) {
int ret;
ret = drm_plane_create_rotation_property(&plane->base,