From: Luca Ceresoli <luca.ceresoli@bootlin.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>,
Andrzej Hajda <andrzej.hajda@intel.com>,
Neil Armstrong <neil.armstrong@linaro.org>,
Robert Foss <rfoss@kernel.org>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Jonas Karlman <jonas@kwiboo.se>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Inki Dae <inki.dae@samsung.com>,
Jagan Teki <jagan@amarulasolutions.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Jessica Zhang <jesszhan0024@gmail.com>,
Douglas Anderson <dianders@chromium.org>,
Marek Vasut <marex@denx.de>, Stefan Agner <stefan@agner.ch>,
Frank Li <Frank.Li@nxp.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>
Cc: Hui Pu <Hui.Pu@gehealthcare.com>,
Ian Ray <ian.ray@gehealthcare.com>,
Luca Ceresoli <luca.ceresoli@bootlin.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org
Subject: [PATCH RFC v3 07/31] drm/display: bridge-connector: split allocation code from initialization code
Date: Wed, 18 Nov 2026 17:49:50 +0100 [thread overview]
Message-ID: <20261118-drm-bridge-hotplug-v3-7-44bb3b4a828f@bootlin.com> (raw)
In-Reply-To: <20261118-drm-bridge-hotplug-v3-0-44bb3b4a828f@bootlin.com>
Currently drm_bridge_connector_init() does two things:
* allocate and initialize the drm_bridge_connector
(which embeds a drm_connector) using drmm
* initialize and register the embedded 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 to support that, split out from drm_bridge_connector_init()
the code to allocate the drm_bridge_connector, so new (de)allocation code
can reuse all the initialization code.
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
Changes in v3:
- Slightly tweak commit title
---
drivers/gpu/drm/display/drm_bridge_connector.c | 62 ++++++++++++++++----------
1 file changed, 38 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c
index 2202e6044444..19cacae617dc 100644
--- a/drivers/gpu/drm/display/drm_bridge_connector.c
+++ b/drivers/gpu/drm/display/drm_bridge_connector.c
@@ -837,27 +837,11 @@ static void drm_bridge_connector_put_bridges(struct drm_device *dev, void *data)
drm_bridge_put(bridge_connector->bridge_hdmi_cec);
}
-/**
- * drm_bridge_connector_init - Initialise a connector for a chain of bridges
- * @drm: the DRM device
- * @encoder: the encoder where the bridge chain starts
- *
- * Create a new &drm_bridge_connector for the @drm device. The connector is
- * allocated, initialised, registered with the @drm device and attached to
- * @encoder.
- *
- * The connector is associated with a chain of bridges that starts at
- * the @encoder. All bridges in the chain shall report bridge operation flags
- * (&drm_bridge->ops) and bridge output type (&drm_bridge->type), and none of
- * them may create a DRM connector directly.
- *
- * Returns a pointer to the new connector on success, or a negative error
- * pointer otherwise.
- */
-struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
- struct drm_encoder *encoder)
+static struct drm_connector *
+drm_bridge_connector_initialize(struct drm_bridge_connector *bridge_connector,
+ struct drm_device *drm,
+ struct drm_encoder *encoder)
{
- struct drm_bridge_connector *bridge_connector;
struct drm_connector *connector;
struct i2c_adapter *ddc = NULL;
struct drm_bridge *panel_bridge __free(drm_bridge_put) = NULL;
@@ -865,10 +849,6 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
int connector_type;
int ret;
- bridge_connector = drmm_kzalloc(drm, sizeof(*bridge_connector), GFP_KERNEL);
- if (!bridge_connector)
- return ERR_PTR(-ENOMEM);
-
ret = drmm_add_action(drm, drm_bridge_connector_put_bridges, bridge_connector);
if (ret)
return ERR_PTR(ret);
@@ -1154,4 +1134,38 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
return connector;
}
+
+/**
+ * drm_bridge_connector_init - Initialise a connector for a chain of bridges
+ * @drm: the DRM device
+ * @encoder: the encoder where the bridge chain starts
+ *
+ * Create a new &drm_bridge_connector for the @drm device. The connector is
+ * allocated, initialised, registered with the @drm device and attached to
+ * @encoder.
+ *
+ * The connector is associated with a chain of bridges that starts at
+ * the @encoder. All bridges in the chain shall report bridge operation flags
+ * (&drm_bridge->ops) and bridge output type (&drm_bridge->type), and none of
+ * them may create a DRM connector directly.
+ *
+ * Returns a pointer to the new connector on success, or a negative error
+ * pointer otherwise.
+ */
+struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
+ struct drm_encoder *encoder)
+{
+ struct drm_bridge_connector *bridge_connector;
+ struct drm_connector *connector;
+
+ bridge_connector = drmm_kzalloc(drm, sizeof(*bridge_connector), GFP_KERNEL);
+ if (!bridge_connector)
+ return ERR_PTR(-ENOMEM);
+
+ connector = drm_bridge_connector_initialize(bridge_connector, drm, encoder);
+ if (IS_ERR(connector))
+ return connector;
+
+ return connector;
+}
EXPORT_SYMBOL_GPL(drm_bridge_connector_init);
--
2.56.1
next prev parent reply other threads:[~2026-11-18 16:50 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 16:49 [PATCH RFC v3 00/31] drm bridge hotplug Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 01/31] drm/display: hdmi-cec-helper: use drmm_ prefix for drmm action Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 02/31] drm/display: hdmi-cec-helper: add non-drmm API variant Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 03/31] drm/display: hdmi-cec-notifier-helper: use drmm_ prefix for drmm action Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 04/31] drm/display: hdmi-cec-notifier-helper: add non-drmm API variant Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 05/31] drm/connector: split drmm_connector_hdmi_init() in 3 parts Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 06/31] drm/connector: add drm_connector_hdmi_dynamic_init() Luca Ceresoli
2026-11-18 16:49 ` Luca Ceresoli [this message]
2026-11-18 16:49 ` [PATCH RFC v3 08/31] drm/display: bridge-connector: hoist error management to common code Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 09/31] drm/display: bridge-connector: use a dynamic connector Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 10/31] drm/display: bridge-connector: add APIs to add/remove the connector dynamically Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 11/31] drm/bridge: constify of_drm_find_and_get_bridge() device_node parameter Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 12/31] drm/bridge: initialize chain_node list head on allocation Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 13/31] drm/bridge: initialize chain_node list head on detach and attach errors Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 14/31] drm/bridge: ti-sn65dsi86: protect device resources on unplug Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 15/31] drm/atomic: drm_atomic_private_obj_fini: protect private_obj removal from list Luca Ceresoli
2026-11-18 16:49 ` [PATCH RFC v3 16/31] drm: event-notifier: add mechanism to notify about hotplug events Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 17/31] drm/bridge: notify about added and detached bridges Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 18/31] drm/mipi-dsi: notify about DSI attach Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 19/31] drm/bridge: add drm_bridge_get_next() and supporting func Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 20/31] drm/panel: implement .get_next_bridge Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 21/31] drm/bridge: display-connector: " Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 22/31] drm/bridge: ti-sn65dsi83: " Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 23/31] drm/bridge: ti-sn65dsi86: " Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 24/31] drm/bridge: samsung-dsim: " Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 25/31] drm/bridge: add drm_bridge_detach_from() Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 26/31] drm/atomic: add drm_atomic_shutdown_encoder() Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 27/31] drm/tests: atomic: add tests for drm_atomic_shutdown_encoder() Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 28/31] drm/bridge: clear bridge->encoder on detach Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 29/31] drm/bridge: shutdown encoder and detach downstream bridges on bridge unplug Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 30/31] drm: drm_hotplug_helper: new helper to implement bridge hotplug Luca Ceresoli
2026-11-18 16:50 ` [PATCH RFC v3 31/31] drm/mxsfb/lcdif: enable " Luca Ceresoli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118-drm-bridge-hotplug-v3-7-44bb3b4a828f@bootlin.com \
--to=luca.ceresoli@bootlin.com \
--cc=Frank.Li@nxp.com \
--cc=Hui.Pu@gehealthcare.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=andrzej.hajda@intel.com \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=festevam@gmail.com \
--cc=ian.ray@gehealthcare.com \
--cc=imx@lists.linux.dev \
--cc=inki.dae@samsung.com \
--cc=jagan@amarulasolutions.com \
--cc=jernej.skrabec@gmail.com \
--cc=jesszhan0024@gmail.com \
--cc=jonas@kwiboo.se \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marex@denx.de \
--cc=mripard@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=rfoss@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=simona@ffwll.ch \
--cc=stefan@agner.ch \
--cc=thomas.petazzoni@bootlin.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®