drm/rockchip: dsi: Disable PLL clock on bind error

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

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
index 9c0fc3f59f3fa7a813a63f9b3e219983cde393e9..4ed7a68681978851e75a79bcdd8ede8bcbb21d68 100644 (file)
--- 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(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);
@@ -956,19 +956,21 @@ 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;
        }
 
        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)