[PATCH RFC v3 02/31] drm/display: hdmi-cec-helper: add non-drmm API variant
From: Luca Ceresoli
Date: Wed Nov 18 2026 - 11:50:28 EST
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 to support hotpluggable HDMI bridges (and the
drm_bridge_connector) add a non-drmm variant of the CEC adapter
(de)registration API, with an explicit unregister API.
Signed-off-by: Luca Ceresoli <luca.ceresoli@xxxxxxxxxxx>
---
drivers/gpu/drm/display/drm_hdmi_cec_helper.c | 60 ++++++++++++++++++---------
include/drm/display/drm_hdmi_cec_helper.h | 6 +++
2 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c b/drivers/gpu/drm/display/drm_hdmi_cec_helper.c
index b79c41703d53..81b271659ad9 100644
--- a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_cec_helper.c
@@ -67,15 +67,8 @@ static void drm_connector_hdmi_cec_adapter_phys_addr_set(struct drm_connector *c
static void drmm_connector_hdmi_cec_adapter_unregister(struct drm_device *dev, void *res)
{
struct drm_connector *connector = res;
- struct drm_connector_hdmi_cec_data *data = connector->cec.data;
-
- cec_unregister_adapter(data->adapter);
-
- if (data->funcs->uninit)
- data->funcs->uninit(connector);
- kfree(data);
- connector->cec.data = NULL;
+ drm_connector_hdmi_cec_unregister(connector);
}
static struct drm_connector_cec_funcs drm_connector_hdmi_cec_adapter_funcs = {
@@ -83,11 +76,11 @@ static struct drm_connector_cec_funcs drm_connector_hdmi_cec_adapter_funcs = {
.phys_addr_set = drm_connector_hdmi_cec_adapter_phys_addr_set,
};
-int drmm_connector_hdmi_cec_register(struct drm_connector *connector,
- const struct drm_connector_hdmi_cec_funcs *funcs,
- const char *name,
- u8 available_las,
- struct device *dev)
+int drm_connector_hdmi_cec_register(struct drm_connector *connector,
+ const struct drm_connector_hdmi_cec_funcs *funcs,
+ const char *name,
+ u8 available_las,
+ struct device *dev)
{
struct drm_connector_hdmi_cec_data *data;
struct cec_connector_info conn_info;
@@ -125,9 +118,8 @@ int drmm_connector_hdmi_cec_register(struct drm_connector *connector,
goto err_delete_adapter;
/*
- * NOTE: the CEC adapter will be unregistered by drmm cleanup from
- * drm_managed_release(), which is called from drm_dev_release()
- * during device unbind.
+ * NOTE: the CEC adapter will be unregistered by
+ * cec_unregister_adapter().
*
* However, the CEC framework cleans up the CEC adapter only when the
* last user has closed its file descriptor, so we don't need to handle
@@ -144,9 +136,7 @@ int drmm_connector_hdmi_cec_register(struct drm_connector *connector,
mutex_unlock(&connector->cec.mutex);
- return drmm_add_action_or_reset(connector->dev,
- drmm_connector_hdmi_cec_adapter_unregister,
- connector);
+ return 0;
err_delete_adapter:
cec_delete_adapter(cec_adap);
@@ -160,6 +150,38 @@ int drmm_connector_hdmi_cec_register(struct drm_connector *connector,
return ret;
}
+EXPORT_SYMBOL(drm_connector_hdmi_cec_register);
+
+void drm_connector_hdmi_cec_unregister(struct drm_connector *connector)
+{
+ struct drm_connector_hdmi_cec_data *data = connector->cec.data;
+
+ cec_unregister_adapter(data->adapter);
+
+ if (data->funcs->uninit)
+ data->funcs->uninit(connector);
+
+ kfree(data);
+ connector->cec.data = NULL;
+}
+EXPORT_SYMBOL(drm_connector_hdmi_cec_unregister);
+
+int drmm_connector_hdmi_cec_register(struct drm_connector *connector,
+ const struct drm_connector_hdmi_cec_funcs *funcs,
+ const char *name,
+ u8 available_las,
+ struct device *dev)
+{
+ int ret;
+
+ ret = drm_connector_hdmi_cec_register(connector, funcs, name, available_las, dev);
+ if (ret)
+ return ret;
+
+ return drmm_add_action_or_reset(connector->dev,
+ drmm_connector_hdmi_cec_adapter_unregister,
+ connector);
+}
EXPORT_SYMBOL(drmm_connector_hdmi_cec_register);
void drm_connector_hdmi_cec_received_msg(struct drm_connector *connector,
diff --git a/include/drm/display/drm_hdmi_cec_helper.h b/include/drm/display/drm_hdmi_cec_helper.h
index fd8f4d2f02c1..7e76a163e3a5 100644
--- a/include/drm/display/drm_hdmi_cec_helper.h
+++ b/include/drm/display/drm_hdmi_cec_helper.h
@@ -39,6 +39,12 @@ struct drm_connector_hdmi_cec_funcs {
u32 signal_free_time, struct cec_msg *msg);
};
+int drm_connector_hdmi_cec_register(struct drm_connector *connector,
+ const struct drm_connector_hdmi_cec_funcs *funcs,
+ const char *name,
+ u8 available_las,
+ struct device *dev);
+void drm_connector_hdmi_cec_unregister(struct drm_connector *connector);
int drmm_connector_hdmi_cec_register(struct drm_connector *connector,
const struct drm_connector_hdmi_cec_funcs *funcs,
const char *name,
--
2.56.1