From: Maxime Ripard <mripard@kernel.org>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
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>,
Douglas Anderson <dianders@chromium.org>
Cc: Herve Codina <herve.codina@bootlin.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Maxime Ripard <mripard@kernel.org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Subject: [PATCH v6 11/16] drm/bridge: Introduce drm_bridge_is_atomic() helper
Date: Thu, 13 Mar 2025 13:00:05 +0100 [thread overview]
Message-ID: <20250313-bridge-connector-v6-11-511c54a604fb@kernel.org> (raw)
In-Reply-To: <20250313-bridge-connector-v6-0-511c54a604fb@kernel.org>
We test for whether the bridge is atomic in several places in the source
code, so let's consolidate them.
Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/drm_bridge.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 5bdce9db4475c9699bec11b1e4c0615af028b33d..ef98e21dc593f38a2d3c67b850032ece38bec5e8 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -279,10 +279,15 @@ drm_bridge_atomic_destroy_priv_state(struct drm_private_obj *obj,
static const struct drm_private_state_funcs drm_bridge_priv_state_funcs = {
.atomic_duplicate_state = drm_bridge_atomic_duplicate_priv_state,
.atomic_destroy_state = drm_bridge_atomic_destroy_priv_state,
};
+static bool drm_bridge_is_atomic(struct drm_bridge *bridge)
+{
+ return bridge->funcs->atomic_reset != NULL;
+}
+
/**
* drm_bridge_attach - attach the bridge to an encoder's chain
*
* @encoder: DRM encoder
* @bridge: bridge to attach
@@ -331,11 +336,11 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
ret = bridge->funcs->attach(bridge, encoder, flags);
if (ret < 0)
goto err_reset_bridge;
}
- if (bridge->funcs->atomic_reset) {
+ if (drm_bridge_is_atomic(bridge)) {
struct drm_bridge_state *state;
state = bridge->funcs->atomic_reset(bridge);
if (IS_ERR(state)) {
ret = PTR_ERR(state);
@@ -376,11 +381,11 @@ void drm_bridge_detach(struct drm_bridge *bridge)
return;
if (WARN_ON(!bridge->dev))
return;
- if (bridge->funcs->atomic_reset)
+ if (drm_bridge_is_atomic(bridge))
drm_atomic_private_obj_fini(&bridge->base);
if (bridge->funcs->detach)
bridge->funcs->detach(bridge);
--
2.48.1
next prev parent reply other threads:[~2025-03-13 12:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 11:59 [PATCH v6 00/16] drm/bridge: Various quality of life improvements Maxime Ripard
2025-03-13 11:59 ` [PATCH v6 01/16] drm/bridge: Add encoder parameter to drm_bridge_funcs.attach Maxime Ripard
2025-03-13 11:59 ` [PATCH v6 02/16] drm/bridge: Provide a helper to retrieve current bridge state Maxime Ripard
2025-03-13 11:59 ` [PATCH v6 03/16] drm/tests: Add kunit tests for bridges Maxime Ripard
2025-03-13 11:59 ` [PATCH v6 04/16] drm/atomic: Introduce helper to lookup connector by encoder Maxime Ripard
2025-03-13 11:59 ` [PATCH v6 05/16] drm/tests: helpers: Create new helper to enable output Maxime Ripard
2025-03-13 12:00 ` [PATCH v6 06/16] drm/tests: hdmi_state_helpers: Switch to new helper Maxime Ripard
2025-03-13 12:00 ` [PATCH v6 07/16] drm/tests: Create tests for drm_atomic Maxime Ripard
2025-03-13 12:00 ` [PATCH v6 08/16] drm/bridge: Add helper to reset bridge pipeline Maxime Ripard
2025-03-13 12:00 ` [PATCH v6 09/16] drm/tests: bridge: Provide tests for drm_bridge_helper_reset_crtc Maxime Ripard
2025-03-13 12:00 ` [PATCH v6 10/16] drm/bridge: ti-sn65dsi83: Switch to drm_bridge_helper_reset_crtc Maxime Ripard
2025-03-13 12:00 ` Maxime Ripard [this message]
2025-03-13 12:00 ` [PATCH v6 12/16] drm/bridge: cdns-csi: Switch to atomic helpers Maxime Ripard
2025-03-13 12:00 ` [PATCH v6 13/16] drm/bridge: tc358775: Switch to atomic commit Maxime Ripard
2025-03-13 12:00 ` [PATCH v6 14/16] drm/bridge: tc358768: Stop disabling when failing to enable Maxime Ripard
2025-03-13 12:00 ` [PATCH v6 15/16] drm/bridge: tc358768: Convert to atomic helpers Maxime Ripard
2025-03-13 12:00 ` [PATCH v6 16/16] drm/bridge: ti-sn65dsi86: Remove drm_encoder->crtc use Maxime Ripard
2025-03-20 13:50 ` [PATCH v6 00/16] drm/bridge: Various quality of life improvements Maxime Ripard
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=20250313-bridge-connector-v6-11-511c54a604fb@kernel.org \
--to=mripard@kernel.org \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=andrzej.hajda@intel.com \
--cc=dianders@chromium.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=herve.codina@bootlin.com \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=neil.armstrong@linaro.org \
--cc=rfoss@kernel.org \
--cc=simona@ffwll.ch \
--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®