lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0108/1039] drm/vc4: hdmi: Enable the scrambler on reconnection
    Date
    From: Maxime Ripard <maxime@cerno.tech>

    [ Upstream commit b7551457c5d0b3505b0be247d47919c1ee30506d ]

    If we have a state already and disconnect/reconnect the display, the
    SCDC messages won't be sent again since we didn't go through a disable /
    enable cycle.

    In order to fix this, let's call the vc4_hdmi_enable_scrambling function
    in the detect callback if there is a mode and it needs the scrambler to
    be enabled.

    Fixes: c85695a2016e ("drm/vc4: hdmi: Enable the scrambler")
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
    Link: https://lore.kernel.org/r/20211025152903.1088803-10-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 05fd54fbb773e..c000946996edb 100644
    --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
    +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
    @@ -162,6 +162,8 @@ static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi)
    static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi) {}
    #endif

    +static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder);
    +
    static enum drm_connector_status
    vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
    {
    @@ -190,6 +192,7 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
    }
    }

    + vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base);
    pm_runtime_put(&vc4_hdmi->pdev->dev);
    return connector_status_connected;
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:54    [W:4.598 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site