Re: [PATCH v2 3/3] drm/rockchip: dsi: Disable PLL clock on bind error

On Tue, Sep 28, 2021 at 2:00 AM Brian Norris briannorris@chromium.org wrote:

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

Reported-by: Chen-Yu Tsai wenst@chromium.org Signed-off-by: Brian Norris briannorris@chromium.org

Fixes: 2d4f7bdafd70 ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")

Otherwise,

Reviewed-by: Chen-Yu Tsai wenst@chromium.org

Additionally, I would move patch 2 and this patch before the first patch, as these two fix a commit introduced in v5.0, while the first patch fixes something introduced in v5.14. This would make automatic backporting cleaner.

---

Changes in v2:

• New

drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c index fa4080176719..0ed13d81fe60 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -943,7 +943,7 @@ static int dw_mipi_dsi_rockchip_bind(struct device *dev, 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);
  

@@ -955,17 +955,19 @@ static int dw_mipi_dsi_rockchip_bind(struct device *dev, 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;
    }
  
    return 0;
  
  

+out_pll_clk:

•   clk_disable_unprepare(dsi->pllref_clk);
  

out_pm_runtime: pm_runtime_put(dsi->dev); if (dsi->slave) -- 2.33.0.685.g46640cef36-goog