Commit e3c2f187 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Thomas Zimmermann
Browse files

drm/i915: Merge fix for "drm: Switch to %p4cc format modifier" 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Fixes: 92f1d09c ("drm: Switch to %p4cc format modifier")
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: dri-devel@lists.freedesktop.org
Link: https://lore.kernel.org/dri-devel/20210514115307.4364aff9@canb.auug.org.au/T/#macc61d4e0b17ca0da2b26aae8fbbcbf47324da13
parent 5c439c38

drivers/gpu/drm/i915/display/skl_universal_plane.c

+2 −4
Original line number Diff line number Diff line
@@ -1082,7 +1082,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, 
	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 +1129,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, 
		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;