lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 175/775] drm/vc4: hdmi: Take into account the clock doubling flag in atomic_check
    Date
    From: Maxime Ripard <maxime@cerno.tech>

    [ Upstream commit 320e84dc6111ecc1c957e2b186d4d2bafee6bde2 ]

    Commit 63495f6b4aed ("drm/vc4: hdmi: Make sure our clock rate is within
    limits") was intended to compute the pixel rate to make sure we remain
    within the boundaries of what the hardware can provide.

    However, unlike what mode_valid was checking for, we forgot to take
    into account the clock doubling flag that can be set for modes. Let's
    honor that flag if it's there.

    Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
    Reported-by: Thomas Zimmermann <tzimmermann@suse.de>
    Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
    Fixes: 63495f6b4aed ("drm/vc4: hdmi: Make sure our clock rate is within limits")
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    Link: https://patchwork.freedesktop.org/patch/msgid/20201215154243.540115-4-maxime@cerno.tech
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
    index 98cab0bbe92d8..2013f83ef50b6 100644
    --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
    +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
    @@ -790,6 +790,9 @@ static int vc4_hdmi_encoder_atomic_check(struct drm_encoder *encoder,
    pixel_rate = mode->clock * 1000;
    }

    + if (mode->flags & DRM_MODE_FLAG_DBLCLK)
    + pixel_rate = pixel_rate * 2;
    +
    if (pixel_rate > vc4_hdmi->variant->max_pixel_clock)
    return -EINVAL;

    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 02:41    [W:4.298 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site