From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 5 May 2021 23:25:45 +0000 (+1000)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=38b90c2dc83bd735fd388347427b2d85852330f1;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'bluetooth/master'
---

38b90c2dc83bd735fd388347427b2d85852330f1
diff --cc drivers/gpu/drm/i915/display/skl_universal_plane.c
index 7ffd7b570b54d,7ffd7b570b54d..538682f882b16
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@@ -1082,7 -1082,7 +1082,6 @@@ static int skl_plane_check_fb(const str
  	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
  	const struct drm_framebuffer *fb = plane_state->hw.fb;
  	unsigned int rotation = plane_state->hw.rotation;
--	struct drm_format_name_buf format_name;
  
  	if (!fb)
  		return 0;
@@@ -1130,9 -1130,9 +1129,8 @@@
  		case DRM_FORMAT_XVYU12_16161616:
  		case DRM_FORMAT_XVYU16161616:
  			drm_dbg_kms(&dev_priv->drm,
--				    "Unsupported pixel format %s for 90/270!\n",
--				    drm_get_format_name(fb->format->format,
--							&format_name));
++				    "Unsupported pixel format %p4cc for 90/270!\n",
++				    &fb->format->format);
  			return -EINVAL;
  		default:
  			break;