[PATCH v7 4/8] drm/rockchip: dw-mipi-dsi: Fix error handling path

[Archit Taneja]

On 01/09/2018 08:18 PM, Thierry Escande wrote:
> From: Jeffy Chen <jeffy.chen at rock-chips.com>
> 
> Add missing pm_runtime_disable() in bind()'s error handling path.
> 
> Also cleanup encoder & connector in unbind().

I guess you'll need to drop this commit if this patch goes in first:

https://patchwork.kernel.org/patch/10106105/

Thanks,
Archit

> 
> Fixes: 80a9a059d4e4 ("drm/rockchip/dsi: add dw-mipi power domain support")
> Signed-off-by: Jeffy Chen <jeffy.chen at rock-chips.com>
> Signed-off-by: Thierry Escande <thierry.escande at collabora.com>
> ---
>   drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 21 +++++++++++++--------
>   1 file changed, 13 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> index b1fe0639227e..78e6b7919bf7 100644
> --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> @@ -1282,7 +1282,7 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
>   	ret = dw_mipi_dsi_register(drm, dsi);
>   	if (ret) {
>   		DRM_DEV_ERROR(dev, "Failed to register mipi_dsi: %d\n", ret);
> -		goto err_pllref;
> +		goto err_disable_pllref;
>   	}
>   
>   	dsi->dsi_host.ops = &dw_mipi_dsi_host_ops;
> @@ -1290,24 +1290,25 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
>   	ret = mipi_dsi_host_register(&dsi->dsi_host);
>   	if (ret) {
>   		DRM_DEV_ERROR(dev, "Failed to register MIPI host: %d\n", ret);
> -		goto err_cleanup;
> +		goto err_disable_pm_runtime;
>   	}
>   
>   	if (!dsi->panel) {
>   		ret = -EPROBE_DEFER;
> -		goto err_mipi_dsi_host;
> +		goto err_unreg_mipi_dsi_host;
>   	}
>   
>   	dev_set_drvdata(dev, dsi);
>   	pm_runtime_enable(dev);
>   	return 0;
>   
> -err_mipi_dsi_host:
> +err_unreg_mipi_dsi_host:
>   	mipi_dsi_host_unregister(&dsi->dsi_host);
> -err_cleanup:
> -	drm_encoder_cleanup(&dsi->encoder);
> -	drm_connector_cleanup(&dsi->connector);
> -err_pllref:
> +err_disable_pm_runtime:
> +	pm_runtime_disable(dev);
> +	dsi->connector.funcs->destroy(&dsi->connector);
> +	dsi->encoder.funcs->destroy(&dsi->encoder);
> +err_disable_pllref:
>   	clk_disable_unprepare(dsi->pllref_clk);
>   	return ret;
>   }
> @@ -1319,6 +1320,10 @@ static void dw_mipi_dsi_unbind(struct device *dev, struct device *master,
>   
>   	mipi_dsi_host_unregister(&dsi->dsi_host);
>   	pm_runtime_disable(dev);
> +
> +	dsi->connector.funcs->destroy(&dsi->connector);
> +	dsi->encoder.funcs->destroy(&dsi->encoder);
> +
>   	clk_disable_unprepare(dsi->pllref_clk);
>   }
>   
> 

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project