Skip to contentSkip to conversation

drm: sun4i: hdmi: Fix inverted HPD result

PATCH Applied Chen-Yu Tsai 3 participants 3 messages Jul 11, 2020 – Jul 17, 2020

Subsystems (4)
lore
Share & tools
lore

Chen-Yu Tsai

author maintainer
#0 lore raw

PATCH 1/1 drm: sun4i: hdmi: Fix inverted HPD result

From: Chen-Yu Tsai <[email protected]>

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")

---

Sorry for the screw-up.

---
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +1 -1
index 557cbe5ab35f..2f2c9f0a1071 100644
@@ -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;
 	}
Signature · 1 line
2.27.0
Tested-by on v1 1/1
#1 lore raw
Quoted 9 lines · Chen-Yu Tsai

From: Chen-Yu Tsai <[email protected]>

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")
Quoted 24 lines

---

Sorry for the screw-up.

---
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +1 -1
index 557cbe5ab35f..2f2c9f0a1071 100644
@@ -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;
 	}
Signature · 1 line
2.27.0
Signature · 1 line
Måns Rullgård