Merge tag 'sunxi-drm-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --combined drivers/gpu/drm/sun4i/sun4i_backend.c
index a278e1f4466195fe5ccbc2141bbd8bcea309a652,5bf1ea4d92fcfc4a6389bcec016d73a448da8df8..08ce15070f80f0c6b11a2bf1648711a647f695f0
--- 1/drivers/gpu/drm/sun4i/sun4i_backend.c
--- 2/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),
@@@ -219,7 -218,7 +219,7 @@@ int sun4i_backend_update_layer_buffer(s
        DRM_DEBUG_DRIVER("Using GEM @ %pad\n", &gem->paddr);
  
        /* Compute the start of the displayed memory */
 -      bpp = drm_format_plane_cpp(fb->pixel_format, 0);
 +      bpp = fb->format->cpp[0];
        paddr = gem->paddr + fb->offsets[0];
        paddr += (state->src_x >> 16) * bpp;
        paddr += (state->src_y >> 16) * fb->pitches[0];