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 0091/1039] drm/rockchip: dsi: Disable PLL clock on bind error
    Date
    From: Brian Norris <briannorris@chromium.org>

    [ Upstream commit 5a614570172e1c9f59035d259dd735acd4f1c01b ]

    Fix some error handling here noticed in review of other changes.

    Fixes: 2d4f7bdafd70 ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")
    Signed-off-by: Brian Norris <briannorris@chromium.org>
    Reported-by: Chen-Yu Tsai <wenst@chromium.org>
    Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
    Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210928143413.v3.4.I8bb7a91ecc411d56bc155763faa15f289d7fc074@changeid
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
    +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
    @@ -944,7 +944,7 @@ static int dw_mipi_dsi_rockchip_bind(str
    ret = clk_prepare_enable(dsi->grf_clk);
    if (ret) {
    DRM_DEV_ERROR(dsi->dev, "Failed to enable grf_clk: %d\n", ret);
    - goto out_pm_runtime;
    + goto out_pll_clk;
    }

    dw_mipi_dsi_rockchip_config(dsi);
    @@ -956,19 +956,21 @@ static int dw_mipi_dsi_rockchip_bind(str
    ret = rockchip_dsi_drm_create_encoder(dsi, drm_dev);
    if (ret) {
    DRM_DEV_ERROR(dev, "Failed to create drm encoder\n");
    - goto out_pm_runtime;
    + goto out_pll_clk;
    }

    ret = dw_mipi_dsi_bind(dsi->dmd, &dsi->encoder);
    if (ret) {
    DRM_DEV_ERROR(dev, "Failed to bind: %d\n", ret);
    - goto out_pm_runtime;
    + goto out_pll_clk;
    }

    dsi->dsi_bound = true;

    return 0;

    +out_pll_clk:
    + clk_disable_unprepare(dsi->pllref_clk);
    out_pm_runtime:
    pm_runtime_put(dsi->dev);
    if (dsi->slave)

    \
     
     \ /
      Last update: 2022-01-25 01:11    [W:4.142 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site