lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 407/800] drm/i915: Merge fix for "drm: Switch to %p4cc format modifier"
    Date
    From: Stephen Rothwell <sfr@canb.auug.org.au>

    [ Upstream commit e3c2f1870af43fc95f6fe141537f5142c5fe4717 ]

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
    Fixes: 92f1d09ca4ed ("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
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++----
    1 file 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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:40    [W:4.078 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site