diff options
| author | Stephen Rothwell <[email protected]> | 2021-03-17 14:05:42 +1100 |
|---|---|---|
| committer | Thomas Zimmermann <[email protected]> | 2021-05-14 14:09:57 +0200 |
| commit | e3c2f1870af43fc95f6fe141537f5142c5fe4717 (patch) | |
| tree | b47e8485835cbab8bcf0b0bf3bb2a9d41377d0e7 | |
| parent | 5c439c38f5fb8fd16b65af4d5bc4618d1ec9bca3 (diff) | |
drm/i915: Merge fix for "drm: Switch to %p4cc format modifier"
Signed-off-by: Stephen Rothwell <[email protected]>
Signed-off-by: Thomas Zimmermann <[email protected]>
Fixes: 92f1d09ca4ed ("drm: Switch to %p4cc format modifier")
Cc: Sakari Ailus <[email protected]>
Cc: Petr Mladek <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: [email protected]
Link: https://lore.kernel.org/dri-devel/[email protected]/T/#macc61d4e0b17ca0da2b26aae8fbbcbf47324da13
| -rw-r--r-- | drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index 7ffd7b570b54..538682f882b1 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -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; |