Message ID | 1506936888-23844-3-git-send-email-benjamin.gaignard@linaro.org |
---|---|
State | Accepted |
Commit | c70087e8f16f1dfe703d223aadd95ede1cde8e30 |
Headers | show |
Series | [v2,1/5] drm/bridge: make drm_panel_bridge_remove more robust | expand |
2017-10-02 11:34 GMT+02:00 Benjamin Gaignard <benjamin.gaignard@linaro.org>: > With a call to drm_of_panel_bridge_remove() we could remove > the bridge without store it in vc4_dpi internal driver structure. + Eric to get his point of view on that > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> > --- > drivers/gpu/drm/vc4/vc4_dpi.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c > index 519cefe..72c9dbd 100644 > --- a/drivers/gpu/drm/vc4/vc4_dpi.c > +++ b/drivers/gpu/drm/vc4/vc4_dpi.c > @@ -97,8 +97,6 @@ struct vc4_dpi { > > struct drm_encoder *encoder; > struct drm_connector *connector; > - struct drm_bridge *bridge; > - bool is_panel_bridge; > > void __iomem *regs; > > @@ -251,10 +249,11 @@ static int vc4_dpi_init_bridge(struct vc4_dpi *dpi) > { > struct device *dev = &dpi->pdev->dev; > struct drm_panel *panel; > + struct drm_bridge *bridge; > int ret; > > ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, > - &panel, &dpi->bridge); > + &panel, &bridge); > if (ret) { > /* If nothing was connected in the DT, that's not an > * error. > @@ -265,13 +264,10 @@ static int vc4_dpi_init_bridge(struct vc4_dpi *dpi) > return ret; > } > > - if (panel) { > - dpi->bridge = drm_panel_bridge_add(panel, > - DRM_MODE_CONNECTOR_DPI); > - dpi->is_panel_bridge = true; > - } > + if (panel) > + bridge = drm_panel_bridge_add(panel, DRM_MODE_CONNECTOR_DPI); > > - return drm_bridge_attach(dpi->encoder, dpi->bridge, NULL); > + return drm_bridge_attach(dpi->encoder, bridge, NULL); > } > > static int vc4_dpi_bind(struct device *dev, struct device *master, void *data) > @@ -352,8 +348,7 @@ static void vc4_dpi_unbind(struct device *dev, struct device *master, > struct vc4_dev *vc4 = to_vc4_dev(drm); > struct vc4_dpi *dpi = dev_get_drvdata(dev); > > - if (dpi->is_panel_bridge) > - drm_panel_bridge_remove(dpi->bridge); > + drm_of_panel_bridge_remove(dev->of_node, 0, 0); > > drm_encoder_cleanup(dpi->encoder); > > -- > 2.7.4 >
Benjamin Gaignard <benjamin.gaignard@linaro.org> writes: > With a call to drm_of_panel_bridge_remove() we could remove > the bridge without store it in vc4_dpi internal driver structure. > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Eric Anholt <eric@anholt.net> Thanks for doing this cleanup!
diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 8dafbdf..6b54f17 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -260,3 +260,36 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, return ret; } EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge); + +#ifdef CONFIG_DRM_PANEL_BRIDGE +/* + * drm_of_panel_bridge_remove - remove panel bridge + * @np: device tree node containing panel bridge output ports + * + * Remove the panel bridge of a given DT node's port and endpoint number + * + * Returns zero if successful, or one of the standard error codes if it fails. + */ +int drm_of_panel_bridge_remove(const struct device_node *np, + int port, int endpoint) +{ + struct drm_bridge *bridge; + struct device_node *remote; + + remote = of_graph_get_remote_node(np, port, endpoint); + if (!remote) + return -ENODEV; + + bridge = of_drm_find_bridge(remote); + drm_panel_bridge_remove(bridge); + + return 0; +} +#else +int drm_of_panel_bridge_remove(const struct device_node *np, + int port, int endpoint) +{ + return -EINVAL; +} +#endif +EXPORT_SYMBOL_GPL(drm_of_panel_bridge_remove); diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 104dd51..390966e 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -29,6 +29,8 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, int port, int endpoint, struct drm_panel **panel, struct drm_bridge **bridge); +int drm_of_panel_bridge_remove(const struct device_node *np, + int port, int endpoint); #else static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, struct device_node *port) @@ -65,6 +67,12 @@ static inline int drm_of_find_panel_or_bridge(const struct device_node *np, { return -EINVAL; } + +static inline int drm_of_panel_bridge_remove(const struct device_node *np, + int port, int endpoint) +{ + return -EINVAL; +} #endif static inline int drm_of_encoder_active_endpoint_id(struct device_node *node,