From: Dave Airlie <airlied@redhat.com>
Date: Thu, 21 Jun 2018 23:58:57 +0000 (+1000)
Subject: Merge tag 'drm-misc-fixes-2018-06-21' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f3294568bbb19cbfc53451de192df6daae80f9b3;p=linux.git

Merge tag 'drm-misc-fixes-2018-06-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Fixes for v4.18-rc2:
- A reversion of a commit in drm/sun4i to fix a run-time fault.
- Various fixes to the sii8620 bridge.
- Small bugfix to correctly check stride in atmel-hlcdc.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/787d4bef-a579-4046-d0fc-f8c2c5b80c25@linux.intel.com
---

f3294568bbb19cbfc53451de192df6daae80f9b3
diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index 73c875db45f43,7b8191eae68a0..47e0992f39083
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@@ -831,15 -871,11 +831,15 @@@ static int atmel_hlcdc_plane_init_prope
  	const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc;
  
  	if (desc->type == ATMEL_HLCDC_OVERLAY_LAYER ||
 -	    desc->type == ATMEL_HLCDC_CURSOR_LAYER)
 -		drm_object_attach_property(&plane->base.base,
 -					   props->alpha, 255);
 +	    desc->type == ATMEL_HLCDC_CURSOR_LAYER) {
 +		int ret;
 +
 +		ret = drm_plane_create_alpha_property(&plane->base);
 +		if (ret)
 +			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,