mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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>
This commit is contained in:
		
							parent
							
								
									a7748dd127
								
							
						
					
					
						commit
						94d50c1a2c
					
				
					 1 changed files with 13 additions and 4 deletions
				
			
		| 
						 | 
					@ -411,11 +411,17 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
 | 
				
			||||||
	if (!encoder || !bridge)
 | 
						if (!encoder || !bridge)
 | 
				
			||||||
		return -EINVAL;
 | 
							return -EINVAL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (previous && (!previous->dev || previous->encoder != encoder))
 | 
						drm_bridge_get(bridge);
 | 
				
			||||||
		return -EINVAL;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (bridge->dev)
 | 
						if (previous && (!previous->dev || previous->encoder != encoder)) {
 | 
				
			||||||
		return -EBUSY;
 | 
							ret = -EINVAL;
 | 
				
			||||||
 | 
							goto err_put_bridge;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (bridge->dev) {
 | 
				
			||||||
 | 
							ret = -EBUSY;
 | 
				
			||||||
 | 
							goto err_put_bridge;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	bridge->dev = encoder->dev;
 | 
						bridge->dev = encoder->dev;
 | 
				
			||||||
	bridge->encoder = encoder;
 | 
						bridge->encoder = encoder;
 | 
				
			||||||
| 
						 | 
					@ -464,6 +470,8 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
 | 
				
			||||||
			      "failed to attach bridge %pOF to encoder %s\n",
 | 
								      "failed to attach bridge %pOF to encoder %s\n",
 | 
				
			||||||
			      bridge->of_node, encoder->name);
 | 
								      bridge->of_node, encoder->name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					err_put_bridge:
 | 
				
			||||||
 | 
						drm_bridge_put(bridge);
 | 
				
			||||||
	return ret;
 | 
						return ret;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
EXPORT_SYMBOL(drm_bridge_attach);
 | 
					EXPORT_SYMBOL(drm_bridge_attach);
 | 
				
			||||||
| 
						 | 
					@ -484,6 +492,7 @@ void drm_bridge_detach(struct drm_bridge *bridge)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	list_del(&bridge->chain_node);
 | 
						list_del(&bridge->chain_node);
 | 
				
			||||||
	bridge->dev = NULL;
 | 
						bridge->dev = NULL;
 | 
				
			||||||
 | 
						drm_bridge_put(bridge);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue