]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/bridge: cdns-dsi: Fix connecting to next bridge
authorAradhya Bhatia <a-bhatia1@ti.com>
Sat, 29 Mar 2025 11:39:12 +0000 (17:09 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Jul 2025 16:24:55 +0000 (18:24 +0200)
commit 688eb4d465484bc2a3471a6a6f06f833b58c7867 upstream.

Fix the OF node pointer passed to the of_drm_find_bridge() call to find
the next bridge in the display chain.

The code to find the next panel (and create its panel-bridge) works
fine, but to find the next (non-panel) bridge does not.

To find the next bridge in the pipeline, we need to pass "np" - the OF
node pointer of the next entity in the devicetree chain. Passing
"of_node" to of_drm_find_bridge (which is what the code does currently)
will fetch the bridge for the cdns-dsi which is not what's required.

Fix that.

Fixes: e19233955d9e ("drm/bridge: Add Cadence DSI driver")
Cc: stable@vger.kernel.org
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tested-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com>
Signed-off-by: Aradhya Bhatia <aradhya.bhatia@linux.dev>
Link: https://lore.kernel.org/r/20250329113925.68204-2-aradhya.bhatia@linux.dev
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/bridge/cdns-dsi.c

index a843cefa00c1e4daf9ab302b0799eaffb17ad335..012ddc979d96bf3b91eefcfdfc79b5b2dffa2e24 100644 (file)
@@ -959,7 +959,7 @@ static int cdns_dsi_attach(struct mipi_dsi_host *host,
        if (!IS_ERR(panel)) {
                bridge = drm_panel_bridge_add(panel, DRM_MODE_CONNECTOR_DSI);
        } else {
-               bridge = of_drm_find_bridge(dev->dev.of_node);
+               bridge = of_drm_find_bridge(np);
                if (!bridge)
                        bridge = ERR_PTR(-EINVAL);
        }