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.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230804061145.2824843-1-Sandor.yu@nxp.com

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index b23214b0c49648d87e9a7d26f23235fb36fd6209..6c1d7947450545916befc09ce2fc3127d9654c99 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -2449,15 +2449,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;
 }
@@ -2958,6 +2950,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);
 }
 
@@ -2976,6 +2969,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);
 }