[PATCH v4 02/15] drm: bridge/dw_hdmi: wrap irq control in fucntions

[Philipp Zabel]

Hi Yakir,

Am Samstag, den 28.02.2015, 21:28 -0500 schrieb Yakir Yang:
> Wrap irq control in functions, and then we can call in
> dw_hdmi_bind/dw_hdmi_unbind/dw_hdmi_resume/dw_hdmi_suspend
> functions.
> 
> Signed-off-by: Yakir Yang <ykk at rock-chips.com>
[...]
> @@ -1702,17 +1722,8 @@ EXPORT_SYMBOL_GPL(dw_hdmi_unbind);
>  int dw_hdmi_suspend(struct device *dev)
>  {
>  	struct dw_hdmi *hdmi = dev_get_drvdata(dev);
> -	u8 ih_mute;
> -
> -	/* Disable all interrupts */
> -	hdmi_writeb(hdmi, ~0, HDMI_IH_MUTE_PHY_STAT0);
> -
> -	 /* Disable top level interrupt bits in HDMI block */
> -	ih_mute = hdmi_readb(hdmi, HDMI_IH_MUTE) |
> -		  HDMI_IH_MUTE_MUTE_WAKEUP_INTERRUPT |
> -		  HDMI_IH_MUTE_MUTE_ALL_INTERRUPT;
>  
> -	hdmi_writeb(hdmi, ih_mute, HDMI_IH_MUTE);
> +	hdmi_mute_interrupts(hdmi);
>  
>  	return 0;
>  }
> @@ -1722,19 +1733,7 @@ int dw_hdmi_resume(struct device *dev)
>  {
>  	struct dw_hdmi *hdmi = dev_get_drvdata(dev);
>  
> -	/*
> -	 * Configure registers related to HDMI interrupt
> -	 * generation before registering IRQ.
> -	 */
> -	hdmi_writeb(hdmi, HDMI_PHY_HPD, HDMI_PHY_POL0);
> -
> -	/* Clear Hotplug interrupts */
> -	hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0);
> -
> -	dw_hdmi_fb_registered(hdmi);
> -
> -	/* Unmute interrupts */
> -	hdmi_writeb(hdmi, ~HDMI_IH_PHY_STAT0_HPD, HDMI_IH_MUTE_PHY_STAT0);
> +	hdmi_unmute_interrupts(hdmi);
>  
>  	return 0;
>  }

Here you remove code added in the previous patch.
It would be better to just apply patch 2 first and then rebase patch 1
on top of it.

regards
Philipp