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 447/800] drm/vc4: hdmi: Fix error path of hpd-gpios
    Date
    From: Maxime Ripard <maxime@cerno.tech>

    [ Upstream commit e075a7811977ff51c917a65ed1896e08231d2615 ]

    If the of_get_named_gpio_flags call fails in vc4_hdmi_bind, we jump to
    the err_unprepare_hsm label. That label will then call
    pm_runtime_disable and put_device on the DDC device.

    We just retrieved the DDC device, so the latter is definitely justified.
    However at that point we still haven't called pm_runtime_enable, so the
    call to pm_runtime_disable is not supposed to be there.

    Fixes: 10ee275cb12f ("drm/vc4: prepare for CEC support")
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210524131852.263883-1-maxime@cerno.tech
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
    index 8106b5634fe1..e94730beb15b 100644
    --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
    +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
    @@ -2000,7 +2000,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
    &hpd_gpio_flags);
    if (vc4_hdmi->hpd_gpio < 0) {
    ret = vc4_hdmi->hpd_gpio;
    - goto err_unprepare_hsm;
    + goto err_put_ddc;
    }

    vc4_hdmi->hpd_active_low = hpd_gpio_flags & OF_GPIO_ACTIVE_LOW;
    @@ -2041,8 +2041,8 @@ err_destroy_conn:
    vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
    err_destroy_encoder:
    drm_encoder_cleanup(encoder);
    -err_unprepare_hsm:
    pm_runtime_disable(dev);
    +err_put_ddc:
    put_device(&vc4_hdmi->ddc->dev);

    return ret;
    --
    2.30.2


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