drm/display: bridge-connector: correct CEC bridge pointers in drm_bridge_connector_init

The bridge used in drm_bridge_connector_init() for CEC init does not
correctly point to the required HDMI CEC bridge, which can lead to
errors during CEC initialization.

Fixes: 65a2575a68e4 ("drm/display: bridge-connector: hook in CEC notifier support")
Fixes: a74288c8ded7 ("drm/display: bridge-connector: handle CEC adapters")
Reported-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Closes: http://lore.kernel.org/r/20250718164156.194702d9@booty/
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Link: https://lore.kernel.org/r/20250719-fix-cec-bridges-v1-1-a60b1333c87d@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c
index 3e4d561a3a32343d5b31eaadb23fe3d4971de140..51f30307d445e5ce1345d11cda391f72e7323533 100644 (file)
--- a/drivers/gpu/drm/display/drm_bridge_connector.c
+++ b/drivers/gpu/drm/display/drm_bridge_connector.c
@@ -813,6 +813,8 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
 
        if (bridge_connector->bridge_hdmi_cec &&
            bridge_connector->bridge_hdmi_cec->ops & DRM_BRIDGE_OP_HDMI_CEC_NOTIFIER) {
+               bridge = bridge_connector->bridge_hdmi_cec;
+
                ret = drmm_connector_hdmi_cec_notifier_register(connector,
                                                                NULL,
                                                                bridge->hdmi_cec_dev);
@@ -822,6 +824,8 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
 
        if (bridge_connector->bridge_hdmi_cec &&
            bridge_connector->bridge_hdmi_cec->ops & DRM_BRIDGE_OP_HDMI_CEC_ADAPTER) {
+               bridge = bridge_connector->bridge_hdmi_cec;
+
                ret = drmm_connector_hdmi_cec_register(connector,
                                                       &drm_bridge_connector_hdmi_cec_funcs,
                                                       bridge->hdmi_cec_adapter_name,