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 26/31] drm/atomic: add drm_atomic_shutdown_encoder()
Date: Wed, 18 Nov 2026 17:50:09 +0100 [thread overview]
Message-ID: <20261118-drm-bridge-hotplug-v3-26-44bb3b4a828f@bootlin.com> (raw)
In-Reply-To: <20261118-drm-bridge-hotplug-v3-0-44bb3b4a828f@bootlin.com>
To support bridge hotplug we need to stop the components of a card that are
affected by the removal of a bridge: the connector, the encoder and
possibly the CRTC (unless it is still in use after the removal due to
cloning).
drm_atomic_helper_shutdown() does it, but it disables the entire card,
including unrelated CRTCs for multi-CRTC cards. Moreover it is in the
drm_kms_helper module, which makes it unaccessible from the core code where
we need this.
Add drm_atomic_shutdown_encoder() to drm_atomic code, doing what we need.
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
New patch in v3
---
drivers/gpu/drm/drm_atomic.c | 145 +++++++++++++++++++++++++++++++++++++++++++
include/drm/drm_atomic.h | 1 +
2 files changed, 146 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index ad2099b4dffd..7015ee18462c 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -2148,6 +2148,151 @@ int __drm_atomic_helper_set_config(struct drm_mode_set *set,
}
EXPORT_SYMBOL(__drm_atomic_helper_set_config);
+static int drm_atomic_disable_encoder(struct drm_device *drm,
+ struct drm_encoder *encoder,
+ struct drm_modeset_acquire_ctx *ctx)
+{
+ struct drm_connector_list_iter conn_iter;
+ struct drm_connector *connector;
+ struct drm_crtc *crtc = NULL;
+ struct drm_atomic_commit *commit;
+ struct drm_crtc_state *crtc_state;
+ bool crtc_still_used = false;
+ int ret;
+
+ drm_connector_list_iter_begin(drm, &conn_iter);
+ drm_for_each_connector_iter(connector, &conn_iter) {
+ if (!connector->state ||
+ connector->state->best_encoder != encoder ||
+ !connector->state->crtc)
+ continue;
+
+ crtc = connector->state->crtc;
+ break;
+ }
+ drm_connector_list_iter_end(&conn_iter);
+
+ if (!crtc)
+ return 0;
+
+ commit = drm_atomic_commit_alloc(drm);
+ if (!commit)
+ return -ENOMEM;
+
+ commit->acquire_ctx = ctx;
+
+ crtc_state = drm_atomic_get_crtc_state(commit, crtc);
+ if (IS_ERR(crtc_state)) {
+ ret = PTR_ERR(crtc_state);
+ goto free;
+ }
+
+ drm_connector_list_iter_begin(drm, &conn_iter);
+ drm_for_each_connector_iter(connector, &conn_iter) {
+ struct drm_connector_state *conn_state;
+
+ if (!connector->state || connector->state->crtc != crtc)
+ continue;
+
+ if (connector->state->best_encoder != encoder) {
+ crtc_still_used = true;
+ continue;
+ }
+
+ conn_state = drm_atomic_get_connector_state(commit, connector);
+ if (IS_ERR(conn_state)) {
+ ret = PTR_ERR(conn_state);
+ drm_connector_list_iter_end(&conn_iter);
+ goto free;
+ }
+ }
+ drm_connector_list_iter_end(&conn_iter);
+
+ if (crtc_still_used) {
+ struct drm_connector_state *conn_state;
+ int i;
+
+ /* Some connector still uses @crtc, keep it and its planes enabled */
+ for_each_new_connector_in_state(commit, connector, conn_state, i) {
+ ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);
+ if (ret < 0)
+ goto free;
+ }
+ } else {
+ struct drm_connector_state *conn_state;
+ struct drm_plane_state *plane_state;
+ struct drm_plane *plane;
+ int i;
+
+ crtc_state->active = false;
+
+ ret = drm_atomic_set_mode_prop_for_crtc(crtc_state, NULL);
+ if (ret < 0)
+ goto free;
+
+ ret = drm_atomic_add_affected_planes(commit, crtc);
+ if (ret < 0)
+ goto free;
+
+ ret = drm_atomic_add_affected_connectors(commit, crtc);
+ if (ret < 0)
+ goto free;
+
+ for_each_new_connector_in_state(commit, connector, conn_state, i) {
+ ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);
+ if (ret < 0)
+ goto free;
+ }
+
+ for_each_new_plane_in_state(commit, plane, plane_state, i) {
+ ret = drm_atomic_set_crtc_for_plane(plane_state, NULL);
+ if (ret < 0)
+ goto free;
+
+ drm_atomic_set_fb_for_plane(plane_state, NULL);
+ }
+ }
+
+ ret = drm_atomic_commit(commit);
+free:
+ drm_atomic_commit_put(commit);
+ return ret;
+}
+
+/**
+ * drm_atomic_shutdown_encoder - shutdown the pipeline behind an encoder
+ * @encoder: encoder whose pipeline should be shut down
+ *
+ * Stop the output currently driven by @encoder. Also shutdown the
+ * connected CRTC unless other connectors are still attached to it
+ * (e.g. cloning).
+ */
+void drm_atomic_shutdown_encoder(struct drm_encoder *encoder)
+{
+ struct drm_modeset_acquire_ctx ctx;
+ struct drm_device *dev;
+ int ret;
+
+ if (!encoder)
+ return;
+
+ dev = encoder->dev;
+ if (!dev)
+ return;
+
+ if (!drm_drv_uses_atomic_modeset(dev))
+ return;
+
+ DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
+
+ ret = drm_atomic_disable_encoder(dev, encoder, &ctx);
+ if (ret)
+ drm_err(dev, "Disabling CRTC for encoder %s failed with %i\n", encoder->name, ret);
+
+ DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+}
+EXPORT_SYMBOL(drm_atomic_shutdown_encoder);
+
static void drm_atomic_private_obj_print_state(struct drm_printer *p,
const struct drm_private_state *state)
{
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index 3ae35b09c0cf..5b6d5e8423a5 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -1409,5 +1409,6 @@ drm_atomic_get_old_bridge_state(const struct drm_atomic_commit *state,
struct drm_bridge_state *
drm_atomic_get_new_bridge_state(const struct drm_atomic_commit *state,
struct drm_bridge *bridge);
+void drm_atomic_shutdown_encoder(struct drm_encoder *encoder);
#endif /* DRM_ATOMIC_H_ */
--
2.56.1
next prev parent reply other threads:[~2026-11-18 16:53 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 ` [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 ` Luca Ceresoli [this message]
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-26-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