A simple convenience function to initialize the struct drm_bridge. The goal is to standardize initialization for any bridge registered with drm_bridge_add() so that we can later add device links for consumers of those bridges. v3: - drop driver_private parameter (Laurent) - spelling & style updates to docs (Laurent) - don't set drm_bridge->dev (field removed) v2: - s/WARN_ON(!funcs)/WARN_ON(!funcs || !dev)/ as suggested by Daniel - expand on some kerneldoc comments as suggested by Daniel - update commit message as suggested by Daniel Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> Signed-off-by: Mihail Atanassov <mihail.atanassov@xxxxxxx> --- drivers/gpu/drm/drm_bridge.c | 30 ++++++++++++++++++++++++++++++ include/drm/drm_bridge.h | 12 ++++++++++++ 2 files changed, 42 insertions(+) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 258094169706..d6b64e9aec7c 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -67,6 +67,11 @@ static LIST_HEAD(bridge_list); * drm_bridge_add - add the given bridge to the global bridge list * * @bridge: bridge control structure + * + * Drivers shall call drm_bridge_init() prior to adding the bridge to the list. + * Before deleting a bridge (usually when the driver is unbound from the + * device), drivers shall call drm_bridge_remove() to remove it from the global + * list. */ void drm_bridge_add(struct drm_bridge *bridge) { @@ -89,6 +94,31 @@ void drm_bridge_remove(struct drm_bridge *bridge) } EXPORT_SYMBOL(drm_bridge_remove); +/** + * drm_bridge_init - initialize a drm_bridge structure + * + * @bridge: bridge control structure + * @dev: device associated with this drm_bridge + * @funcs: control functions + * @timings: timing specification for the bridge; optional (may be NULL) + */ +void drm_bridge_init(struct drm_bridge *bridge, struct device *dev, + const struct drm_bridge_funcs *funcs, + const struct drm_bridge_timings *timings) +{ + WARN_ON(!funcs || !dev); + + bridge->encoder = NULL; + INIT_LIST_HEAD(&bridge->chain_node); + +#ifdef CONFIG_OF + bridge->of_node = dev->of_node; +#endif + bridge->timings = timings; + bridge->funcs = funcs; +} +EXPORT_SYMBOL(drm_bridge_init); + /** * drm_bridge_attach - attach the bridge to an encoder's chain * diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index ee175a2f95e6..955d9bd13805 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -378,6 +378,15 @@ struct drm_bridge_timings { /** * struct drm_bridge - central DRM bridge control structure + * + * Bridge drivers shall call drm_bridge_init() to initialize a drm_bridge + * structure, and then register it with drm_bridge_add(). + * + * Users of bridges link a bridge driver into their overall display output + * pipeline by calling drm_bridge_attach(). + * + * Modular drivers in OF systems can query the list of registered bridges + * with of_drm_find_bridge(). */ struct drm_bridge { /** @encoder: encoder to which this bridge is connected */ @@ -402,6 +411,9 @@ struct drm_bridge { void drm_bridge_add(struct drm_bridge *bridge); void drm_bridge_remove(struct drm_bridge *bridge); +void drm_bridge_init(struct drm_bridge *bridge, struct device *dev, + const struct drm_bridge_funcs *funcs, + const struct drm_bridge_timings *timings); struct drm_bridge *of_drm_find_bridge(struct device_node *np); int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, struct drm_bridge *previous); -- 2.24.0 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel