drm/bridge: lt8912b: Add hot plug detection
authorStefan Eichenberger <stefan.eichenberger@toradex.com>
Mon, 28 Nov 2022 11:23:20 +0000 (12:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:51:58 +0000 (11:51 +0100)
[ Upstream commit 3b0a01a6a5224ed9b3f69f44edaa889b2e2b9779 ]

Enable hot plug detection when it is available on the HDMI port.
Without this connecting to a different monitor with incompatible timing
before the 10 seconds poll period will lead to a broken display output.

Fixes: 30e2ae943c26 ("drm/bridge: Introduce LT8912B DSI to HDMI bridge")
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Adrien Grassein <adrien.grassein@gmail.com>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20221128112320.25708-1-francesco@dolcini.it
Stable-dep-of: 941882a0e96d ("drm/bridge: lt8912b: Fix bridge_detach")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/bridge/lontium-lt8912b.c

index 5e41993..8d2785a 100644 (file)
@@ -516,14 +516,27 @@ static int lt8912_attach_dsi(struct lt8912 *lt)
        return 0;
 }
 
+static void lt8912_bridge_hpd_cb(void *data, enum drm_connector_status status)
+{
+       struct lt8912 *lt = data;
+
+       if (lt->bridge.dev)
+               drm_helper_hpd_irq_event(lt->bridge.dev);
+}
+
 static int lt8912_bridge_connector_init(struct drm_bridge *bridge)
 {
        int ret;
        struct lt8912 *lt = bridge_to_lt8912(bridge);
        struct drm_connector *connector = &lt->connector;
 
-       connector->polled = DRM_CONNECTOR_POLL_CONNECT |
-                           DRM_CONNECTOR_POLL_DISCONNECT;
+       if (lt->hdmi_port->ops & DRM_BRIDGE_OP_HPD) {
+               drm_bridge_hpd_enable(lt->hdmi_port, lt8912_bridge_hpd_cb, lt);
+               connector->polled = DRM_CONNECTOR_POLL_HPD;
+       } else {
+               connector->polled = DRM_CONNECTOR_POLL_CONNECT |
+                                   DRM_CONNECTOR_POLL_DISCONNECT;
+       }
 
        ret = drm_connector_init(bridge->dev, connector,
                                 &lt8912_connector_funcs,
@@ -577,6 +590,10 @@ static void lt8912_bridge_detach(struct drm_bridge *bridge)
 
        if (lt->is_attached) {
                lt8912_hard_power_off(lt);
+
+               if (lt->hdmi_port->ops & DRM_BRIDGE_OP_HPD)
+                       drm_bridge_hpd_disable(lt->hdmi_port);
+
                drm_connector_unregister(&lt->connector);
                drm_connector_cleanup(&lt->connector);
        }