From: Dave Airlie <airlied@redhat.com>
Date: Tue, 31 Jan 2017 22:43:19 +0000 (+1000)
Subject: Merge tag 'sunxi-drm-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.11-rc1~83^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02a84c135ee94924c094fdbb70030a49cddbe85b;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'sunxi-drm-for-4.11' of https://git./linux/kernel/git/mripard/linux into drm-next

Allwinner DRM changes for 4.11

Just one minor fix.

* tag 'sunxi-drm-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  drm/sun4i: Fix a return value in case of error
---

02a84c135ee94924c094fdbb70030a49cddbe85b
diff --cc drivers/gpu/drm/sun4i/sun4i_backend.c
index a278e1f,5bf1ea4..08ce150
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@@ -189,11 -189,10 +189,11 @@@ int sun4i_backend_update_layer_formats(
  	DRM_DEBUG_DRIVER("Switching display backend interlaced mode %s\n",
  			 interlaced ? "on" : "off");
  
 -	ret = sun4i_backend_drm_format_to_layer(plane, fb->pixel_format, &val);
 +	ret = sun4i_backend_drm_format_to_layer(plane, fb->format->format,
 +						&val);
  	if (ret) {
  		DRM_DEBUG_DRIVER("Invalid format\n");
- 		return val;
+ 		return ret;
  	}
  
  	regmap_update_bits(backend->regs, SUN4I_BACKEND_ATTCTL_REG1(layer),