Skip to content

Commit 94d50c1

Browse files
committed
drm/bridge: get/put the bridge reference in drm_bridge_attach/detach()
drm_bridge_attach() adds the bridge to the encoder chain, so take a reference for that. Vice versa in drm_bridge_detach(). Reviewed-by: Maxime Ripard <mripard@kernel.org> Link: https://lore.kernel.org/r/20250620-drm-bridge-alloc-getput-drm-bridge-c-v9-2-ca53372c9a84@bootlin.com Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
1 parent a7748dd commit 94d50c1

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

drivers/gpu/drm/drm_bridge.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,11 +411,17 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
411411
if (!encoder || !bridge)
412412
return -EINVAL;
413413

414-
if (previous && (!previous->dev || previous->encoder != encoder))
415-
return -EINVAL;
414+
drm_bridge_get(bridge);
416415

417-
if (bridge->dev)
418-
return -EBUSY;
416+
if (previous && (!previous->dev || previous->encoder != encoder)) {
417+
ret = -EINVAL;
418+
goto err_put_bridge;
419+
}
420+
421+
if (bridge->dev) {
422+
ret = -EBUSY;
423+
goto err_put_bridge;
424+
}
419425

420426
bridge->dev = encoder->dev;
421427
bridge->encoder = encoder;
@@ -464,6 +470,8 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
464470
"failed to attach bridge %pOF to encoder %s\n",
465471
bridge->of_node, encoder->name);
466472

473+
err_put_bridge:
474+
drm_bridge_put(bridge);
467475
return ret;
468476
}
469477
EXPORT_SYMBOL(drm_bridge_attach);
@@ -484,6 +492,7 @@ void drm_bridge_detach(struct drm_bridge *bridge)
484492

485493
list_del(&bridge->chain_node);
486494
bridge->dev = NULL;
495+
drm_bridge_put(bridge);
487496
}
488497

489498
/**

0 commit comments

Comments
 (0)