[PATCH 2/2] drm/meson: dw-hdmi: Enable the iahb clock early enough

[Neil Armstrong]

On 20/11/2020 10:42, Marc Zyngier wrote:
> Instead of moving meson_dw_hdmi_init() around which breaks existing
> platform, let's enable the clock meson_dw_hdmi_init() depends on.
> This means we don't have to worry about this clock being enabled or
> not, depending on the boot-loader features.
> 
> Fixes: b33340e33acd ("drm/meson: dw-hdmi: Ensure that clocks are enabled before touching the TOP registers")
> Reported-by: Guillaume Tucker <guillaume.tucker at collabora.com>
> Tested-by: Guillaume Tucker <guillaume.tucker at collabora.com>
> Signed-off-by: Marc Zyngier <maz at kernel.org>
> ---
>  drivers/gpu/drm/meson/meson_dw_hdmi.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> index 29623b309cb1..aad75a22dc33 100644
> --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
> +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> @@ -1051,6 +1051,10 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
>  	if (ret)
>  		return ret;
>  
> +	ret = meson_enable_clk(dev, "iahb");
> +	if (ret)
> +		return ret;
> +
>  	ret = meson_enable_clk(dev, "venci");
>  	if (ret)
>  		return ret;
> @@ -1086,6 +1090,8 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
>  
>  	encoder->possible_crtcs = BIT(0);
>  
> +	meson_dw_hdmi_init(meson_dw_hdmi);
> +
>  	DRM_DEBUG_DRIVER("encoder initialized\n");
>  
>  	/* Bridge / Connector */
> @@ -1110,8 +1116,6 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
>  	if (IS_ERR(meson_dw_hdmi->hdmi))
>  		return PTR_ERR(meson_dw_hdmi->hdmi);
>  
> -	meson_dw_hdmi_init(meson_dw_hdmi);
> -
>  	next_bridge = of_drm_find_bridge(pdev->dev.of_node);
>  	if (next_bridge)
>  		drm_bridge_attach(encoder, next_bridge,
> 
Reviewed-by: Neil Armstrong <narmstrong at baylibre.com>