drm/bridge: cdns-dsi: Move to devm_drm_of_get_bridge()

Instead of manually finding the next bridge/panel, and maintaining the
panel-bridge (in-case the next entity is a panel), switch to using the
automatically managing devm_drm_of_get_bridge() API.

Drop the drm_panel support completely from the driver while at it.

Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
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-7-aradhya.bhatia@linux.dev
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
index 93c3d5f1651d1b5bf4ca8670cf01480f2047376b..89a3f3efc522a6d23c9228a85a5b3176551ebea7 100644 (file)
--- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
@@ -955,8 +955,6 @@ static int cdns_dsi_attach(struct mipi_dsi_host *host,
        struct cdns_dsi_output *output = &dsi->output;
        struct cdns_dsi_input *input = &dsi->input;
        struct drm_bridge *bridge;
-       struct drm_panel *panel;
-       struct device_node *np;
        int ret;
 
        /*
@@ -974,26 +972,10 @@ static int cdns_dsi_attach(struct mipi_dsi_host *host,
        /*
         * The host <-> device link might be described using an OF-graph
         * representation, in this case we extract the device of_node from
-        * this representation, otherwise we use dsidev->dev.of_node which
-        * should have been filled by the core.
+        * this representation.
         */
-       np = of_graph_get_remote_node(dsi->base.dev->of_node, DSI_OUTPUT_PORT,
-                                     dev->channel);
-       if (!np)
-               np = of_node_get(dev->dev.of_node);
-
-       panel = of_drm_find_panel(np);
-       if (!IS_ERR(panel)) {
-               bridge = drm_panel_bridge_add_typed(panel,
-                                                   DRM_MODE_CONNECTOR_DSI);
-       } else {
-               bridge = of_drm_find_bridge(np);
-               if (!bridge)
-                       bridge = ERR_PTR(-EINVAL);
-       }
-
-       of_node_put(np);
-
+       bridge = devm_drm_of_get_bridge(dsi->base.dev, dsi->base.dev->of_node,
+                                       DSI_OUTPUT_PORT, dev->channel);
        if (IS_ERR(bridge)) {
                ret = PTR_ERR(bridge);
                dev_err(host->dev, "failed to add DSI device %s (err = %d)",
@@ -1003,7 +985,6 @@ static int cdns_dsi_attach(struct mipi_dsi_host *host,
 
        output->dev = dev;
        output->bridge = bridge;
-       output->panel = panel;
 
        /*
         * The DSI output has been properly configured, we can now safely
@@ -1019,12 +1000,9 @@ static int cdns_dsi_detach(struct mipi_dsi_host *host,
                           struct mipi_dsi_device *dev)
 {
        struct cdns_dsi *dsi = to_cdns_dsi(host);
-       struct cdns_dsi_output *output = &dsi->output;
        struct cdns_dsi_input *input = &dsi->input;
 
        drm_bridge_remove(&input->bridge);
-       if (output->panel)
-               drm_panel_bridge_remove(output->bridge);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.h b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.h
index ca7ea2da635c77e752e654a77b35bde10d1ab05e..5db5dbbbcaadbe7a49596b349e381a671741a810 100644 (file)
--- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.h
+++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.h
@@ -10,7 +10,6 @@
 
 #include <drm/drm_bridge.h>
 #include <drm/drm_mipi_dsi.h>
-#include <drm/drm_panel.h>
 
 #include <linux/bits.h>
 #include <linux/completion.h>
@@ -21,7 +20,6 @@ struct reset_control;
 
 struct cdns_dsi_output {
        struct mipi_dsi_device *dev;
-       struct drm_panel *panel;
        struct drm_bridge *bridge;
        union phy_configure_opts phy_opts;
 };