diff mbox series

drm: sun4i: hdmi: Fix inverted HPD result

Message ID 20200711011030.21997-1-wens@kernel.org
State Mainlined
Commit baa1841eb797eadce6c907bdaed7cd6f01815404
Headers show
Series drm: sun4i: hdmi: Fix inverted HPD result | expand

Commit Message

Chen-Yu Tsai July 11, 2020, 1:10 a.m. UTC
From: Chen-Yu Tsai <wens@csie.org>

When the extra HPD polling in sun4i_hdmi was removed, the result of
HPD was accidentally inverted.

Fix this by inverting the check.

Fixes: bda8eaa6dee7 ("drm: sun4i: hdmi: Remove extra HPD polling")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---

Sorry for the screw-up.

---
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Måns Rullgård July 14, 2020, 1:40 p.m. UTC | #1
Chen-Yu Tsai <wens@kernel.org> writes:

> From: Chen-Yu Tsai <wens@csie.org>
>
> When the extra HPD polling in sun4i_hdmi was removed, the result of
> HPD was accidentally inverted.
>
> Fix this by inverting the check.
>
> Fixes: bda8eaa6dee7 ("drm: sun4i: hdmi: Remove extra HPD polling")
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

Tested-by: Mans Rullgard <mans@mansr.com>

> ---
>
> Sorry for the screw-up.
>
> ---
>  drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> index 557cbe5ab35f..2f2c9f0a1071 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> @@ -260,7 +260,7 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force)
>  	unsigned long reg;
>
>  	reg = readl(hdmi->base + SUN4I_HDMI_HPD_REG);
> -	if (reg & SUN4I_HDMI_HPD_HIGH) {
> +	if (!(reg & SUN4I_HDMI_HPD_HIGH)) {
>  		cec_phys_addr_invalidate(hdmi->cec_adap);
>  		return connector_status_disconnected;
>  	}
> -- 
> 2.27.0
>
Maxime Ripard July 17, 2020, 1:40 p.m. UTC | #2
On Sat, Jul 11, 2020 at 09:10:30AM +0800, Chen-Yu Tsai wrote:
> From: Chen-Yu Tsai <wens@csie.org>
> 
> When the extra HPD polling in sun4i_hdmi was removed, the result of
> HPD was accidentally inverted.
> 
> Fix this by inverting the check.
> 
> Fixes: bda8eaa6dee7 ("drm: sun4i: hdmi: Remove extra HPD polling")
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

Applied, thanks!
Maxime
diff mbox series

Patch

diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 557cbe5ab35f..2f2c9f0a1071 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -260,7 +260,7 @@  sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force)
 	unsigned long reg;
 
 	reg = readl(hdmi->base + SUN4I_HDMI_HPD_REG);
-	if (reg & SUN4I_HDMI_HPD_HIGH) {
+	if (!(reg & SUN4I_HDMI_HPD_HIGH)) {
 		cec_phys_addr_invalidate(hdmi->cec_adap);
 		return connector_status_disconnected;
 	}