OSDN Git Service

Revert "drm: bridge: mcde_dsi: Drop explicit bridge remove"
authorJagan Teki <jagan@amarulasolutions.com>
Fri, 29 Apr 2022 08:59:46 +0000 (14:29 +0530)
committerMaxime Ripard <maxime@cerno.tech>
Wed, 4 May 2022 15:06:17 +0000 (17:06 +0200)
commit <3730bc6147b0> ("drm: bridge: mcde_dsi: Drop explicit bridge
remove") has removed downstream bridge as it's prior commit <3d7039e1e649>
("drm: bridge: mcde_dsi: Switch to devm_drm_of_get_bridge") added
devm_drm_of_get_bridge for looking up if child node has panel or bridge.

However commit <b089c0a9b14c> ("Revert "drm: of: Lookup if child node
has panel or bridge") has reverted panel or bridge child node lookup
from devm_drm_of_get_bridge as it breaks the non-trivial cases the
first child node might not be a panel or bridge.

So, revert this commit to switch the previous behavior of looking up
child panel or bridge.

Link: https://lore.kernel.org/all/20220429085947.1699963-1-jagan@amarulasolutions.com/
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
drivers/gpu/drm/mcde/mcde_dsi.c

index 960b49e..083a472 100644 (file)
@@ -1122,6 +1122,7 @@ static void mcde_dsi_unbind(struct device *dev, struct device *master,
 {
        struct mcde_dsi *d = dev_get_drvdata(dev);
 
+       drm_bridge_remove(d->bridge_out);
        regmap_update_bits(d->prcmu, PRCM_DSI_SW_RESET,
                           PRCM_DSI_SW_RESET_DSI0_SW_RESETN, 0);
 }