Now a panel_bridge is automatically created for every drm_panel, so this code (similar to an open-coded variant of drm_of_find_panel_or_bridge()) would lead to creating a second panel_bridge for the same panel.
Fix and simplify the code by just getting a reference to the already-existing bridge. Also keep the "connected to non-panel bridge (unsupported)\n" error logic by using the drm_bridge_is_panel() function. Signed-off-by: Luca Ceresoli <[email protected]> --- drivers/gpu/drm/mcde/mcde_dsi.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index ce078aa3910f..ec45440d20d7 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -39,7 +39,6 @@ struct mcde_dsi { struct device *dev; struct mcde *mcde; struct drm_bridge bridge; - struct drm_panel *panel; struct mipi_dsi_host dsi_host; struct mipi_dsi_device *mdsi; const struct drm_display_mode *mode; @@ -1076,7 +1075,6 @@ 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 drm_panel *panel = NULL; struct drm_bridge *bridge __free(drm_bridge_put) = NULL; if (!of_get_available_child_count(dev->of_node)) { @@ -1104,40 +1102,21 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, /* Look for a panel as a child to this node */ for_each_available_child_of_node_scoped(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_and_get_bridge(child); - if (!bridge) { - dev_err(dev, "failed to find bridge\n"); - return -EINVAL; - } + bridge = of_drm_find_and_get_bridge(child); + if (!bridge) { + dev_err(dev, "failed to find bridge\n"); + return -EINVAL; } - if (panel || bridge) - break; + break; } - if (panel) { - bridge = drm_panel_bridge_add_typed(panel, - DRM_MODE_CONNECTOR_DSI); - drm_panel_put(panel); - if (IS_ERR(bridge)) { - dev_err(dev, "error adding panel bridge\n"); - return PTR_ERR(bridge); - } - drm_bridge_get(bridge); - dev_info(dev, "connected to panel\n"); - d->panel = panel; - } else if (bridge) { + if (!bridge) { + dev_err(dev, "no panel or bridge\n"); + return -ENODEV; + } else if (!drm_bridge_is_panel(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; } d->bridge.next_bridge = drm_bridge_get(bridge); @@ -1159,8 +1138,6 @@ 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.next_bridge); regmap_update_bits(d->prcmu, PRCM_DSI_SW_RESET, PRCM_DSI_SW_RESET_DSI0_SW_RESETN, 0); } -- 2.55.0
