[PATCH v3 08/22] drm/bridge: imx8qxp-pixel-combiner: get/put the next bridge

Luca Ceresoli
2025-12-16T18:00:13Z

This driver obtains a bridge pointer from of_drm_find_bridge() in the probe
function and stores it until driver removal. of_drm_find_bridge() is
deprecated. Move to of_drm_find_and_get_bridge() for the bridge to be
refcounted and use bridge->next_bridge to put the reference on
deallocation.

Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c
index 8517b1c953d4..74eda8b54023 100644
--- a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c
+++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c
@@ -60,7 +60,6 @@ enum imx8qxp_pc_pix_data_format {

struct imx8qxp_pc_channel {
struct drm_bridge bridge;
- struct drm_bridge *next_bridge;
struct imx8qxp_pc *pc;
unsigned int stream_id;
};
@@ -120,7 +119,7 @@ static int imx8qxp_pc_bridge_attach(struct drm_bridge *bridge,
}

return drm_bridge_attach(encoder,
- ch->next_bridge, bridge,
+ ch->bridge.next_bridge, bridge,
DRM_BRIDGE_ATTACH_NO_CONNECTOR);
}

@@ -326,8 +325,8 @@ static int imx8qxp_pc_bridge_probe(struct platform_device *pdev)
goto free_child;
}

- ch->next_bridge = of_drm_find_bridge(remote);
- if (!ch->next_bridge) {
+ ch->bridge.next_bridge = of_drm_find_and_get_bridge(remote);
+ if (!ch->bridge.next_bridge) {
of_node_put(remote);
ret = -EPROBE_DEFER;
DRM_DEV_DEBUG_DRIVER(dev,
@@ -349,7 +348,7 @@ static int imx8qxp_pc_bridge_probe(struct platform_device *pdev)
free_child:
of_node_put(child);

- if (i == 1 && pc->ch[0]->next_bridge)
+ if (i == 1 && pc->ch[0]->bridge.next_bridge)
drm_bridge_remove(&pc->ch[0]->bridge);

pm_runtime_disable(dev);

--
2.52.0