[PATCH RFC v3 09/31] drm/display: bridge-connector: use a dynamic connector

From: Luca Ceresoli

Date: Wed Nov 18 2026 - 11:52:09 EST


Currently the drm_bridge_connector uses drmm functions to add the
drm_connector. For bridge hotplug drmm allocations are not suitable because
a connector may have to be added and removed multiple times in the lifetime
of a card.

In preparation for bridge hotplug, use the dynamic variants of
drm_connector[_hdmi]_init() and the non-drmm versions of
drmm_connector_hdmi_cec[_notifier]_register() so the drm_connector can be
removed without removing the whole card.

Signed-off-by: Luca Ceresoli <luca.ceresoli@xxxxxxxxxxx>

---

Changes in v3:
- convert CEC code to non-drmm too
- fix connector state error management
- put the connector on error paths after the dynamic_init() step
- fix drmm-allocation leak on drm_bridge_connector_init() error path
---
drivers/gpu/drm/display/drm_bridge_connector.c | 141 ++++++++++++++++++-------
1 file changed, 102 insertions(+), 39 deletions(-)

diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c
index f4a71801e8a3..015f6750b7f5 100644
--- a/drivers/gpu/drm/display/drm_bridge_connector.c
+++ b/drivers/gpu/drm/display/drm_bridge_connector.c
@@ -132,11 +132,27 @@ struct drm_bridge_connector {
* bridge connector.
*/
struct drm_connector_hdmi_funcs hdmi_funcs;
+ /** @has_cec_adapter: true if a CEC adapter is registered */
+ bool has_cec_adapter;
+ /** @has_cec_notifier true if a CEC notifier is registered */
+ bool has_cec_notifier;
};

#define to_drm_bridge_connector(x) \
container_of(x, struct drm_bridge_connector, base)

+static void drm_bridge_connector_put_bridges(struct drm_bridge_connector *bridge_connector)
+{
+ drm_bridge_put(bridge_connector->bridge_edid);
+ drm_bridge_put(bridge_connector->bridge_hpd);
+ drm_bridge_put(bridge_connector->bridge_detect);
+ drm_bridge_put(bridge_connector->bridge_modes);
+ drm_bridge_put(bridge_connector->bridge_hdmi);
+ drm_bridge_put(bridge_connector->bridge_hdmi_audio);
+ drm_bridge_put(bridge_connector->bridge_dp_audio);
+ drm_bridge_put(bridge_connector->bridge_hdmi_cec);
+}
+
/* -----------------------------------------------------------------------------
* Bridge Connector Hot-Plug Handling
*/
@@ -267,6 +283,14 @@ drm_bridge_connector_color_format(const struct drm_connector_state *conn_state)
return conn_state->color_format;
}

+static void drm_bridge_connector_dynconn_destroy(struct drm_connector *connector)
+{
+ struct drm_bridge_connector *bridge_connector = to_drm_bridge_connector(connector);
+
+ drm_connector_cleanup(connector);
+ drm_bridge_connector_put_bridges(bridge_connector);
+}
+
static const struct drm_connector_funcs drm_bridge_connector_funcs = {
.fill_modes = drm_helper_probe_single_connector_modes,
.atomic_create_state = drm_bridge_connector_create_state,
@@ -275,6 +299,7 @@ static const struct drm_connector_funcs drm_bridge_connector_funcs = {
.debugfs_init = drm_bridge_connector_debugfs_init,
.oob_hotplug_event = drm_bridge_connector_oob_hotplug_event,
.color_format = drm_bridge_connector_color_format,
+ .destroy = drm_bridge_connector_dynconn_destroy,
};

/* -----------------------------------------------------------------------------
@@ -823,20 +848,6 @@ static const struct drm_connector_hdmi_cec_funcs drm_bridge_connector_hdmi_cec_f
* Bridge Connector Initialisation
*/

-static void drm_bridge_connector_put_bridges(struct drm_device *dev, void *data)
-{
- struct drm_bridge_connector *bridge_connector = (struct drm_bridge_connector *)data;
-
- drm_bridge_put(bridge_connector->bridge_edid);
- drm_bridge_put(bridge_connector->bridge_hpd);
- drm_bridge_put(bridge_connector->bridge_detect);
- drm_bridge_put(bridge_connector->bridge_modes);
- drm_bridge_put(bridge_connector->bridge_hdmi);
- drm_bridge_put(bridge_connector->bridge_hdmi_audio);
- drm_bridge_put(bridge_connector->bridge_dp_audio);
- drm_bridge_put(bridge_connector->bridge_hdmi_cec);
-}
-
static struct drm_connector *
drm_bridge_connector_initialize(struct drm_bridge_connector *bridge_connector,
struct drm_device *drm,
@@ -849,10 +860,6 @@ drm_bridge_connector_initialize(struct drm_bridge_connector *bridge_connector,
int connector_type;
int ret;

- ret = drmm_add_action(drm, drm_bridge_connector_put_bridges, bridge_connector);
- if (ret)
- return ERR_PTR(ret);
-
bridge_connector->encoder = encoder;

/*
@@ -1053,17 +1060,21 @@ drm_bridge_connector_initialize(struct drm_bridge_connector *bridge_connector,
drm_bridge_connector_scrambler_disable;
}

- ret = drmm_connector_hdmi_init(drm, connector,
- &drm_bridge_connector_funcs,
- &bridge_connector->hdmi_funcs,
- connector_type, ddc);
+ ret = drm_connector_hdmi_dynamic_init(drm, connector,
+ &drm_bridge_connector_funcs,
+ &bridge_connector->hdmi_funcs,
+ connector_type, ddc);
} else {
- ret = drmm_connector_init(drm, connector,
- &drm_bridge_connector_funcs,
- connector_type, ddc);
+ ret = drm_connector_dynamic_init(drm, connector,
+ &drm_bridge_connector_funcs,
+ connector_type, ddc);
}
- if (ret)
- return ret;
+ if (ret) {
+ drm_bridge_connector_put_bridges(bridge_connector);
+ return ERR_PTR(ret);
+ }
+
+ /* From now on the connector is referenced and has to be put */

if (bridge_connector->bridge_hdmi_audio ||
bridge_connector->bridge_dp_audio) {
@@ -1084,35 +1095,48 @@ drm_bridge_connector_initialize(struct drm_bridge_connector *bridge_connector,
bridge->hdmi_audio_spdif_playback,
bridge->hdmi_audio_dai_port);
if (ret)
- return ERR_PTR(ret);
+ goto err_put_connector;
}

if (bridge_connector->bridge_hdmi_cec &&
bridge_connector->bridge_hdmi_cec->ops & DRM_BRIDGE_OP_HDMI_CEC_NOTIFIER) {
struct drm_bridge *bridge = bridge_connector->bridge_hdmi_cec;

- ret = drmm_connector_hdmi_cec_notifier_register(connector,
- NULL,
- bridge->hdmi_cec_dev);
+ ret = drm_connector_hdmi_cec_notifier_register(connector,
+ NULL,
+ bridge->hdmi_cec_dev);
if (ret)
- return ERR_PTR(ret);
+ goto err_put_connector;
+
+ bridge_connector->has_cec_notifier = true;
}

if (bridge_connector->bridge_hdmi_cec &&
bridge_connector->bridge_hdmi_cec->ops & DRM_BRIDGE_OP_HDMI_CEC_ADAPTER) {
struct drm_bridge *bridge = bridge_connector->bridge_hdmi_cec;

- ret = drmm_connector_hdmi_cec_register(connector,
- &drm_bridge_connector_hdmi_cec_funcs,
- bridge->hdmi_cec_adapter_name,
- bridge->hdmi_cec_available_las,
- bridge->hdmi_cec_dev);
+ ret = drm_connector_hdmi_cec_register(connector,
+ &drm_bridge_connector_hdmi_cec_funcs,
+ bridge->hdmi_cec_adapter_name,
+ bridge->hdmi_cec_available_las,
+ bridge->hdmi_cec_dev);
if (ret)
- return ERR_PTR(ret);
+ goto err_unregister_cec_notifier;
+
+ bridge_connector->has_cec_adapter = true;
}

drm_connector_helper_add(connector, &drm_bridge_connector_helper_funcs);

+ if (!connector->state) {
+ struct drm_connector_state *state = drm_bridge_connector_create_state(connector);
+ if (IS_ERR(state)) {
+ ret = PTR_ERR(state);
+ goto err_unregister_cec_adapter;
+ }
+ connector->state = state;
+ }
+
if (bridge_connector->bridge_hpd)
connector->polled = DRM_CONNECTOR_POLL_HPD;
else if (bridge_connector->bridge_detect)
@@ -1128,9 +1152,43 @@ drm_bridge_connector_initialize(struct drm_bridge_connector *bridge_connector,

ret = drm_connector_attach_encoder(connector, encoder);
if (ret)
- return ERR_PTR(ret);
+ goto err_unregister_cec_adapter;
+
+ ret = drm_connector_dynamic_register(connector);
+ if (ret)
+ goto err_unregister_cec_adapter;

return connector;
+
+err_unregister_cec_adapter:
+ if (bridge_connector->has_cec_adapter)
+ drm_connector_hdmi_cec_unregister(connector);
+err_unregister_cec_notifier:
+ if (bridge_connector->has_cec_notifier)
+ drm_connector_hdmi_cec_notifier_unregister(connector);
+err_put_connector:
+ drm_connector_put(connector);
+
+ return ERR_PTR(ret);
+}
+
+static void drm_bridge_connector_fini(struct drm_bridge_connector *bridge_connector)
+{
+ struct drm_connector *connector = &bridge_connector->base;
+
+ drm_connector_unregister(connector);
+ if (bridge_connector->has_cec_adapter)
+ drm_connector_hdmi_cec_unregister(connector);
+ if (bridge_connector->has_cec_notifier)
+ drm_connector_hdmi_cec_notifier_unregister(connector);
+ drm_connector_put(connector);
+}
+
+static void drmm_bridge_connector_fini(struct drm_device *dev, void *res)
+{
+ struct drm_bridge_connector *bridge_connector = (struct drm_bridge_connector *)res;
+
+ drm_bridge_connector_fini(bridge_connector);
}

/**
@@ -1155,6 +1213,7 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
{
struct drm_bridge_connector *bridge_connector;
struct drm_connector *connector;
+ int ret;

bridge_connector = drmm_kzalloc(drm, sizeof(*bridge_connector), GFP_KERNEL);
if (!bridge_connector)
@@ -1164,6 +1223,10 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
if (IS_ERR(connector))
return connector;

+ ret = drmm_add_action_or_reset(drm, drmm_bridge_connector_fini, bridge_connector);
+ if (ret)
+ return ERR_PTR(ret);
+
return connector;
}
EXPORT_SYMBOL_GPL(drm_bridge_connector_init);

--
2.56.1