From: Jagan Teki Date: Fri, 29 Apr 2022 08:59:46 +0000 (+0530) Subject: Revert "drm: bridge: mcde_dsi: Drop explicit bridge remove" X-Git-Tag: v6.6.17~3937^2~23^2~2525 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6aba439620123c6bf2201e76d1162e380462e4d6;p=platform%2Fkernel%2Flinux-rpi.git Revert "drm: bridge: mcde_dsi: Drop explicit bridge remove" 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 ("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 Reviewed-by: Linus Walleij Signed-off-by: Maxime Ripard --- diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 960b49e..083a472 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -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); }