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 273/775] drm/vc4: hdmi: Move hdmi reset to bind
    Date
    From: Dom Cobley <popcornmix@gmail.com>

    [ Upstream commit 902dc5c19a8fecd3113dd41cc601b34557bdede9 ]

    The hdmi reset got moved to a later point in the commit 9045e91a476b
    ("drm/vc4: hdmi: Add reset callback").

    However, the reset now occurs after vc4_hdmi_cec_init and so tramples
    the setup of registers like HDMI_CEC_CNTRL_1

    This only affects pi0-3 as on pi4 the cec registers are in a separate
    block

    Fixes: 9045e91a476b ("drm/vc4: hdmi: Add reset callback")
    Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
    Signed-off-by: Dom Cobley <popcornmix@gmail.com>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Tested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210111142309.193441-3-maxime@cerno.tech
    (cherry picked from commit 7155334f15f360f5c98391c5c7e12af4c13395c4)
    Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
    index 2013f83ef50b6..ea50ecf985d1c 100644
    --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
    +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
    @@ -660,9 +660,6 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder)
    return;
    }

    - if (vc4_hdmi->variant->reset)
    - vc4_hdmi->variant->reset(vc4_hdmi);
    -
    if (vc4_hdmi->variant->phy_init)
    vc4_hdmi->variant->phy_init(vc4_hdmi, mode);

    @@ -1743,6 +1740,9 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
    vc4_hdmi->disable_wifi_frequencies =
    of_property_read_bool(dev->of_node, "wifi-2.4ghz-coexistence");

    + if (vc4_hdmi->variant->reset)
    + vc4_hdmi->variant->reset(vc4_hdmi);
    +
    pm_runtime_enable(dev);

    drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
    --
    2.27.0


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