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 14/31] drm/bridge: ti-sn65dsi86: protect device resources on unplug
Date: Wed, 18 Nov 2026 17:49:57 +0100 [thread overview]
Message-ID: <20261118-drm-bridge-hotplug-v3-14-44bb3b4a828f@bootlin.com> (raw)
In-Reply-To: <20261118-drm-bridge-hotplug-v3-0-44bb3b4a828f@bootlin.com>
To support hot-unplug of this bridge we need to protect access to device
resources in case device removal happens concurrently to other code.
Some care is needed for the case when drm_bridge_unplug() happens before
ti_sn_bridge_atomic_post_disable(), so the latter cannot release supplier
resources taken by ti_sn_bridge_atomic_pre_enable(): runtime PM (and in
turn regulators) and refclk.
To ensure those resources are released exactly once on device removal:
* move the code to release them to a dedicated function
* register that function when the resources are taken in
ti_sn_bridge_atomic_pre_enable()
* if ti_sn_bridge_atomic_post_disable() happens before drm_bridge_unplug()
(typical non-hot-unplug case):
* ti_sn_bridge_atomic_post_disable() can enter the critical section
(drm_bridge_enter() returns 0) -> it releases and executes the
devres action
* if ti_sn_bridge_atomic_post_disable() happens after drm_bridge_unplug()
(typical hot-unplug case):
* ti_sn_bridge_remove() -> drm_bridge_unplug() defuses
ti_sn_bridge_atomic_post_disable() so it cannot execute the devres
action
* the devres action is executed just after ti_sn_bridge_remove()
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
New patch in v3
This commit basically replicates the same change done on the ti-sn65dsi83
driver, now upstream:
https://lore.kernel.org/all/20251112-drm-bridge-atomic-vs-remove-v3-2-85db717ce094@bootlin.com/
---
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 50 ++++++++++++++++++++++++++++++++---
1 file changed, 46 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index 4fd9fde77d2b..75e36bf261b0 100644
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -852,9 +852,15 @@ static void ti_sn_bridge_atomic_disable(struct drm_bridge *bridge,
struct drm_atomic_commit *state)
{
struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
+ int idx;
+
+ if (!drm_bridge_enter(bridge, &idx))
+ return;
/* disable video stream */
regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, VSTREAM_ENABLE, 0);
+
+ drm_bridge_exit(idx);
}
static void ti_sn_bridge_set_dsi_rate(struct ti_sn65dsi86 *pdata,
@@ -1124,11 +1130,16 @@ static void ti_sn_bridge_atomic_enable(struct drm_bridge *bridge,
int ret = -EINVAL;
int max_dp_lanes;
unsigned int bpp;
+ int idx;
+
+ if (!drm_bridge_enter(bridge, &idx))
+ return;
connector = drm_atomic_get_new_connector_for_encoder(state,
bridge->encoder);
if (!connector) {
dev_err_ratelimited(pdata->dev, "Could not get the connector\n");
+ drm_bridge_exit(idx);
return;
}
@@ -1206,6 +1217,7 @@ static void ti_sn_bridge_atomic_enable(struct drm_bridge *bridge,
}
if (ret) {
DRM_DEV_ERROR(pdata->dev, "%s (%d)\n", last_err_str, ret);
+ drm_bridge_exit(idx);
return;
}
@@ -1215,26 +1227,57 @@ static void ti_sn_bridge_atomic_enable(struct drm_bridge *bridge,
/* enable video stream */
regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, VSTREAM_ENABLE,
VSTREAM_ENABLE);
+
+ drm_bridge_exit(idx);
+}
+
+/*
+ * Release resources taken by ti_sn_bridge_atomic_pre_enable().
+ *
+ * Invoked by ti_sn_bridge_atomic_post_disable() normally, or by devres
+ * after ti_sn_bridge_remove() in case this happens befora
+ * atomic_post_disable.
+ */
+static void ti_sn_bridge_release_resources(void *data)
+{
+ struct ti_sn65dsi86 *pdata = (struct ti_sn65dsi86 *)data;
+
+ if (!pdata->refclk)
+ ti_sn65dsi86_disable_comms(pdata);
+
+ pm_runtime_put_sync(pdata->dev);
}
static void ti_sn_bridge_atomic_pre_enable(struct drm_bridge *bridge,
struct drm_atomic_commit *state)
{
struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
+ int idx;
+
+ if (!drm_bridge_enter(bridge, &idx))
+ return;
pm_runtime_get_sync(pdata->dev);
if (!pdata->refclk)
ti_sn65dsi86_enable_comms(pdata, state);
+ devm_add_action(pdata->dev, ti_sn_bridge_release_resources, pdata);
+
/* td7: min 100 us after enable before DSI data */
usleep_range(100, 110);
+
+ drm_bridge_exit(idx);
}
static void ti_sn_bridge_atomic_post_disable(struct drm_bridge *bridge,
struct drm_atomic_commit *state)
{
struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
+ int idx;
+
+ if (!drm_bridge_enter(bridge, &idx))
+ return;
/* semi auto link training mode OFF */
regmap_write(pdata->regmap, SN_ML_TX_MODE_REG, 0);
@@ -1243,10 +1286,9 @@ static void ti_sn_bridge_atomic_post_disable(struct drm_bridge *bridge,
/* disable DP PLL */
regmap_write(pdata->regmap, SN_PLL_ENABLE_REG, 0);
- if (!pdata->refclk)
- ti_sn65dsi86_disable_comms(pdata);
+ devm_release_action(pdata->dev, ti_sn_bridge_release_resources, pdata);
- pm_runtime_put_sync(pdata->dev);
+ drm_bridge_exit(idx);
}
static enum drm_connector_status
@@ -1514,7 +1556,7 @@ static void ti_sn_bridge_remove(struct auxiliary_device *adev)
if (!pdata)
return;
- drm_bridge_remove(&pdata->bridge);
+ drm_bridge_unplug(&pdata->bridge);
of_node_put(pdata->host_node);
}
--
2.56.1
next prev parent reply other threads:[~2026-11-18 16:51 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 ` [PATCH RFC v3 07/31] drm/display: bridge-connector: split allocation code from initialization code Luca Ceresoli
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 ` Luca Ceresoli [this message]
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-14-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®