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

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

Posted by Dmitry Baryshkov 2 months, 2 weeks ago

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/
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 drivers/gpu/drm/display/drm_bridge_connector.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c
index 5eb7e9bfe36116c9618cd3773f1c01e7ebb573be..8c915427d0538435661d771940efe38b462027a1 100644
--- a/drivers/gpu/drm/display/drm_bridge_connector.c
+++ b/drivers/gpu/drm/display/drm_bridge_connector.c
@@ -816,6 +816,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);
@@ -825,6 +827,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,

---
base-commit: d086c886ceb9f59dea6c3a9dae7eb89e780a20c9
change-id: 20250718-fix-cec-bridges-245d334d3712

Best regards,
-- 
With best wishes
Dmitry

Re: [PATCH] drm/display: bridge-connector: correct CEC bridge pointers in drm_bridge_connector_init

Posted by Dmitry Baryshkov 2 months, 2 weeks ago

On Sat, 19 Jul 2025 13:58:13 +0300, Dmitry Baryshkov wrote:
> 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.
> 
> 

Applied to drm-misc-next, thanks!

[1/1] drm/display: bridge-connector: correct CEC bridge pointers in drm_bridge_connector_init
      commit: 92e34a5241ddf4b084df20e6953275d16f156aa8

Best regards,
-- 
With best wishes
Dmitry

Re: [PATCH] drm/display: bridge-connector: correct CEC bridge pointers in drm_bridge_connector_init

Posted by Luca Ceresoli 2 months, 2 weeks ago

On Sat, 19 Jul 2025 13:58:13 +0300
Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> wrote:

> 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/
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com