Skip to contentSkip to conversation

drm: bridge: dw_hdmi: Fix ELD is not updated issue

PATCH Applied Sandor Yu 2 participants 3 messages Aug 4, 2023

Subsystems (3)
lore
Share & tools
lore

Sandor Yu

author
#0 lore raw

PATCH v2 1/1 drm: bridge: dw_hdmi: Fix ELD is not updated issue

The ELD (EDID-Like Data) is not updated when the HDMI cable is plugged into different HDMI monitors.
This is because the EDID is not updated in the HDMI HPD function. As a result, the ELD data remains unchanged and may not reflect the capabilities of the newly connected HDMI sink device.

To address this issue, the handle_plugged_change function should move to the bridge_atomic_enable and bridge_atomic_disable functions. Make sure the EDID is properly updated before updating ELD.

---
v2:
- Add the variable of last_connector_result back to driver.
It will only be used to initialize audio codec jack status when audio codec driver probe.

---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +3 -9
index aa51c61a78c7..963050de42c3 100644
@@ -2463,15 +2463,7 @@ static enum drm_connector_status dw_hdmi_detect(struct dw_hdmi *hdmi)
 	enum drm_connector_status result;
 
 	result = hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);
-
-	mutex_lock(&hdmi->mutex);
-	if (result != hdmi->last_connector_result) {
-		dev_dbg(hdmi->dev, "read_hpd result: %d", result);
-		handle_plugged_change(hdmi,
-				      result == connector_status_connected);
-		hdmi->last_connector_result = result;
-	}
-	mutex_unlock(&hdmi->mutex);
+	hdmi->last_connector_result = result;
 
 	return result;
 }
@@ -2971,6 +2963,7 @@ static void dw_hdmi_bridge_atomic_disable(struct drm_bridge *bridge,
 	hdmi->curr_conn = NULL;
 	dw_hdmi_update_power(hdmi);
 	dw_hdmi_update_phy_mask(hdmi);
+	handle_plugged_change(hdmi, false);
 	mutex_unlock(&hdmi->mutex);
 }
 
@@ -2989,6 +2982,7 @@ static void dw_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,
 	hdmi->curr_conn = connector;
 	dw_hdmi_update_power(hdmi);
 	dw_hdmi_update_phy_mask(hdmi);
+	handle_plugged_change(hdmi, true);
 	mutex_unlock(&hdmi->mutex);
 }
 
Signature · 1 line
2.34.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 51 lines · Sandor Yu

The ELD (EDID-Like Data) is not updated when the HDMI cable is plugged into different HDMI monitors.
This is because the EDID is not updated in the HDMI HPD function. As a result, the ELD data remains unchanged and may not reflect the capabilities of the newly connected HDMI sink device.

To address this issue, the handle_plugged_change function should move to the bridge_atomic_enable and bridge_atomic_disable functions. Make sure the EDID is properly updated before updating ELD.

---
v2:
- Add the variable of last_connector_result back to driver.
It will only be used to initialize audio codec jack status when audio codec driver probe.

---
  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 12 +++---------
  1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +2 -9
index aa51c61a78c7..963050de42c3 100644
@@ -2463,15 +2463,7 @@ static enum drm_connector_status dw_hdmi_detect(struct dw_hdmi *hdmi)
  	enum drm_connector_status result;
 
  	result = hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);
-
-	mutex_lock(&hdmi->mutex);
-	if (result != hdmi->last_connector_result) {
-		dev_dbg(hdmi->dev, "read_hpd result: %d", result);
-		handle_plugged_change(hdmi,
-				      result == connector_status_connected);
-		hdmi->last_connector_result = result;
-	}
-	mutex_unlock(&hdmi->mutex);
+	hdmi->last_connector_result = result;
 
  	return result;
  }
@@ -2971,6 +2963,7 @@ static void dw_hdmi_bridge_atomic_disable(struct drm_bridge *bridge,
  	hdmi->curr_conn = NULL;
  	dw_hdmi_update_power(hdmi);
  	dw_hdmi_update_phy_mask(hdmi);
+	handle_plugged_change(hdmi, false);
  	mutex_unlock(&hdmi->mutex);
  }
 

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c static void dw_hdmi_bridge_atomic_enable(struct drm_bridge *bridge, · line 2988

Quoted 7 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1 -0
@@ -2989,6 +2982,7 @@ static void dw_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,
  	hdmi->curr_conn = connector;
  	dw_hdmi_update_power(hdmi);
  	dw_hdmi_update_phy_mask(hdmi);
+	handle_plugged_change(hdmi, true);
  	mutex_unlock(&hdmi->mutex);
  }
 
maintainer Applied
#2 lore raw
In reply to Sandor Yu

Hi,

Quoted 11 lines · Sandor Yu

The ELD (EDID-Like Data) is not updated when the HDMI cable is plugged into different HDMI monitors.
This is because the EDID is not updated in the HDMI HPD function. As a result, the ELD data remains unchanged and may not reflect the capabilities of the newly connected HDMI sink device.

To address this issue, the handle_plugged_change function should move to the bridge_atomic_enable and bridge_atomic_disable functions. Make sure the EDID is properly updated before updating ELD.

[...]

Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-next)

[1/1] drm: bridge: dw_hdmi: Fix ELD is not updated issue

      https://cgit.freedesktop.org/drm/drm-misc/commit/?id=6db96c7703edd6e37da8ca571dfe5e1ecb6010c1
Signature · 1 line
Neil