Bridges obtained via devm_drm_bridge_alloc(dev, ...) will be put when the
requesting device (@dev) is removed.
However drivers which obtained them may need to put the obtained reference
explicitly. One such case is if they bind the devm removal action to a
different device than the one implemented by the driver itself and which
might be removed at a different time, such as bridge/panel.c.
Add devm_drm_put_bridge() to manually release a devm-obtained bridge in
such cases.
Signed-off-by: Luca Ceresoli <luca.ceres...@bootlin.com>
---
To: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
To: Maxime Ripard <mrip...@kernel.org>
To: Thomas Zimmermann <tzimmerm...@suse.de>
To: David Airlie <airl...@gmail.com>
To: Simona Vetter <sim...@ffwll.ch>
To: Andrzej Hajda <andrzej.ha...@intel.com>
To: Neil Armstrong <neil.armstr...@linaro.org>
To: Robert Foss <rf...@kernel.org>
To: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
To: Jonas Karlman <jo...@kwiboo.se>
To: Jernej Skrabec <jernej.skra...@gmail.com>
To: Jagan Teki <ja...@amarulasolutions.com>
To: Shawn Guo <shawn...@kernel.org>
To: Sascha Hauer <s.ha...@pengutronix.de>
To: Pengutronix Kernel Team <ker...@pengutronix.de>
To: Fabio Estevam <feste...@gmail.com>
To: Douglas Anderson <diand...@chromium.org>
To: Chun-Kuang Hu <chunkuang...@kernel.org>
To: Krzysztof Kozlowski <k...@kernel.org>
To: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
Cc: Anusha Srivatsa <asriv...@redhat.com>
Cc: Paul Kocialkowski <pa...@sys-base.io>
Cc: Dmitry Baryshkov <lu...@kernel.org>
Cc: Hervé Codina <herve.cod...@bootlin.com>
Cc: Hui Pu <hui...@gehealthcare.com>
Cc: Thomas Petazzoni <thomas.petazz...@bootlin.com>
Cc: dri-devel@lists.freedesktop.org
Cc: as...@lists.linux.dev
Cc: linux-ker...@vger.kernel.org
Cc: chrome-platf...@lists.linux.dev
Cc: i...@lists.linux.dev
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-media...@lists.infradead.org
Cc: linux-amlo...@lists.infradead.org
Cc: linux-renesas-...@vger.kernel.org
Cc: platform-driver-...@vger.kernel.org
Cc: linux-samsung-...@vger.kernel.org
Cc: linux-arm-...@vger.kernel.org
Cc: freedr...@lists.freedesktop.org
Cc: linux-st...@st-md-mailman.stormreply.com
---
drivers/gpu/drm/drm_bridge.c | 14 ++++++++++++++
include/drm/drm_bridge.h | 4 ++++
2 files changed, 18 insertions(+)
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index
b4c89ec01998b849018ce031c7cd84614e65e710..456363d86080b2a55035c3108c16afa4f9e57e06
100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -1392,6 +1392,20 @@ struct drm_bridge *of_drm_find_bridge(struct device_node
*np)
EXPORT_SYMBOL(of_drm_find_bridge);
#endif
+/**
+ * devm_drm_put_bridge - Release a bridge reference obtained via devm
+ * @dev: device that got the bridge via devm
+ * @bridge: pointer to a struct drm_bridge obtained via devm
+ *
+ * Same as drm_bridge_put() for bridge pointers obtained via devm functions
+ * such as devm_drm_bridge_alloc().
+ */
+void devm_drm_put_bridge(struct device *dev, struct drm_bridge *bridge)
+{
+ devm_release_action(dev, drm_bridge_put_void, bridge);
+}
+EXPORT_SYMBOL(devm_drm_put_bridge);
+
static void drm_bridge_debugfs_show_bridge(struct drm_printer *p,
struct drm_bridge *bridge,
unsigned int idx)
diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
index
df9bbf6fd1fb522add28b76406b74cdb7391fc57..5b4e5e935a17ba6fc4a6a53ad0a302e249ca418b
100644
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
@@ -1167,6 +1167,8 @@ static inline struct drm_bridge
*devm_drm_of_get_bridge(struct device *dev,
return ERR_PTR(-ENODEV);
}
+static inline void devm_drm_put_bridge(struct device *dev, struct drm_bridge
*bridge) {}
+
static inline struct drm_bridge *drmm_of_get_bridge(struct drm_device *drm,
struct device_node *node,
u32 port,
@@ -1176,6 +1178,8 @@ static inline struct drm_bridge
*drmm_of_get_bridge(struct drm_device *drm,
}
#endif
+void devm_drm_put_bridge(struct device *dev, struct drm_bridge *bridge);
+
void drm_bridge_debugfs_params(struct dentry *root);
void drm_bridge_debugfs_encoder_params(struct dentry *root, struct drm_encoder
*encoder);
--
2.49.0
