Commit 5a614570 authored by Brian Norris's avatar Brian Norris Committed by Heiko Stuebner
Browse files

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



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

Fixes: 2d4f7bda ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Reported-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Tested-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210928143413.v3.4.I8bb7a91ecc411d56bc155763faa15f289d7fc074@changeid
parent 25188839

drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c

+5 −3
Original line number Diff line number Diff line
@@ -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)