On Thu, Mar 31, 2022 at 09:15:03PM +0530, Jagan Teki wrote:
devm_drm_of_get_bridge is capable of looking up the downstream bridge and panel and trying to add a panel bridge if the panel is found.
Replace explicit finding calls with devm_drm_of_get_bridge.
Cc: Linus Walleij linus.walleij@linaro.org Signed-off-by: Jagan Teki jagan@amarulasolutions.com Reviewed-by: Linus Walleij linus.walleij@linaro.org
Changes for v4:
- collect r-b
Changes for v3:
- fix commit head
- drop panel.h
- use drm_bridge_remove
Changes for v2:
- split the patch
drivers/gpu/drm/mcde/mcde_dsi.c | 44 +++++---------------------------- 1 file changed, 6 insertions(+), 38 deletions(-)
diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 5651734ce977..083a4728654d 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -19,7 +19,6 @@ #include <drm/drm_mipi_dsi.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_of.h> -#include <drm/drm_panel.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h>
@@ -39,7 +38,6 @@ struct mcde_dsi { struct device *dev; struct mcde *mcde; struct drm_bridge bridge;
- struct drm_panel *panel; struct drm_bridge *bridge_out; struct mipi_dsi_host dsi_host; struct mipi_dsi_device *mdsi;
@@ -1073,9 +1071,7 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, struct drm_device *drm = data; struct mcde *mcde = to_mcde(drm); struct mcde_dsi *d = dev_get_drvdata(dev);
- struct device_node *child;
- struct drm_panel *panel = NULL;
- struct drm_bridge *bridge = NULL;
struct drm_bridge *bridge;
if (!of_get_available_child_count(dev->of_node)) { dev_info(dev, "unused DSI interface\n");
@@ -1100,37 +1096,10 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, return PTR_ERR(d->lp_clk); }
- /* Look for a panel as a child to this node */
- for_each_available_child_of_node(dev->of_node, child) {
panel = of_drm_find_panel(child);if (IS_ERR(panel)) {dev_err(dev, "failed to find panel try bridge (%ld)\n",PTR_ERR(panel));panel = NULL;bridge = of_drm_find_bridge(child);if (!bridge) {dev_err(dev, "failed to find bridge\n");return -EINVAL;}}- }
- if (panel) {
bridge = drm_panel_bridge_add_typed(panel,DRM_MODE_CONNECTOR_DSI);if (IS_ERR(bridge)) {dev_err(dev, "error adding panel bridge\n");return PTR_ERR(bridge);}dev_info(dev, "connected to panel\n");d->panel = panel;- } else if (bridge) {
/* TODO: AV8100 HDMI encoder goes here for example */dev_info(dev, "connected to non-panel bridge (unsupported)\n");return -ENODEV;- } else {
dev_err(dev, "no panel or bridge\n");return -ENODEV;
bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);
if (IS_ERR(bridge)) {
dev_err(dev, "error to get bridge\n");return PTR_ERR(bridge);}
d->bridge_out = bridge;
@@ -1153,8 +1122,7 @@ static void mcde_dsi_unbind(struct device *dev, struct device *master, { struct mcde_dsi *d = dev_get_drvdata(dev);
- if (d->panel)
drm_panel_bridge_remove(d->bridge_out);
- drm_bridge_remove(d->bridge_out);
You don't need drm_bridge_remove if you used devm_drm_of_get_bridge
Maxime