drm/msm/dsi: simplify connector creation

Instead of having two functions, msm_dsi_manager_bridge_init()
and msm_dsi_manager_ext_bridge_init(), merge them into
msm_dsi_manager_connector_init(), moving drm_bridge_attach() to be
called from the bridge's attach callback (as most other bridges do).

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/582212/
Link: https://lore.kernel.org/r/20240309-fd-dsi-cleanup-bridges-v1-3-962ebdba82ed@linaro.org

diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
index 38f10f7a10d34a001536b268ebfec0c1a574b38c..efd7c23b662fffea212beb641b87d7394f29fa65 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi.c
+++ b/drivers/gpu/drm/msm/dsi/dsi.c
@@ -232,7 +232,6 @@ void __exit msm_dsi_unregister(void)
 int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
                         struct drm_encoder *encoder)
 {
-       struct drm_bridge *bridge;
        int ret;
 
        msm_dsi->dev = dev;
@@ -252,14 +251,7 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
                return 0;
        }
 
-       bridge = msm_dsi_manager_bridge_init(msm_dsi, encoder);
-       if (IS_ERR(bridge)) {
-               ret = PTR_ERR(bridge);
-               DRM_DEV_ERROR(dev->dev, "failed to create dsi bridge: %d\n", ret);
-               return ret;
-       }
-
-       ret = msm_dsi_manager_ext_bridge_init(msm_dsi->id, bridge);
+       ret = msm_dsi_manager_connector_init(msm_dsi, encoder);
        if (ret) {
                DRM_DEV_ERROR(dev->dev,
                        "failed to create dsi connector: %d\n", ret);

diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h
index 0adef65be1ded718fd1171de3a65a2eb62b208a3..afc290408ba44398a900d785ed3b5db62af95acd 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi.h
+++ b/drivers/gpu/drm/msm/dsi/dsi.h
@@ -47,9 +47,8 @@ struct msm_dsi {
 };
 
 /* dsi manager */
-struct drm_bridge *msm_dsi_manager_bridge_init(struct msm_dsi *msm_dsi,
-                                              struct drm_encoder *encoder);
-int msm_dsi_manager_ext_bridge_init(u8 id, struct drm_bridge *int_bridge);
+int msm_dsi_manager_connector_init(struct msm_dsi *msm_dsi,
+                                  struct drm_encoder *encoder);
 int msm_dsi_manager_cmd_xfer(int id, const struct mipi_dsi_msg *msg);
 bool msm_dsi_manager_cmd_xfer_trigger(int id, u32 dma_base, u32 len);
 int msm_dsi_manager_register(struct msm_dsi *msm_dsi);

diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
index b7c52b14c7909849d19e7c45f600f0355626ca61..5b3f3068fd92f7b46c16811b99b2159d869ca92d 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -423,7 +423,18 @@ static enum drm_mode_status dsi_mgr_bridge_mode_valid(struct drm_bridge *bridge,
        return msm_dsi_host_check_dsc(host, mode);
 }
 
+static int dsi_mgr_bridge_attach(struct drm_bridge *bridge,
+                                enum drm_bridge_attach_flags flags)
+{
+       int id = dsi_mgr_bridge_get_id(bridge);
+       struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
+
+       return drm_bridge_attach(bridge->encoder, msm_dsi->next_bridge,
+                                bridge, flags);
+}
+
 static const struct drm_bridge_funcs dsi_mgr_bridge_funcs = {
+       .attach = dsi_mgr_bridge_attach,
        .pre_enable = dsi_mgr_bridge_pre_enable,
        .post_disable = dsi_mgr_bridge_post_disable,
        .mode_set = dsi_mgr_bridge_mode_set,
@@ -431,17 +442,19 @@ static const struct drm_bridge_funcs dsi_mgr_bridge_funcs = {
 };
 
 /* initialize bridge */
-struct drm_bridge *msm_dsi_manager_bridge_init(struct msm_dsi *msm_dsi,
-                                              struct drm_encoder *encoder)
+int msm_dsi_manager_connector_init(struct msm_dsi *msm_dsi,
+                                  struct drm_encoder *encoder)
 {
+       struct drm_device *dev = msm_dsi->dev;
        struct drm_bridge *bridge;
        struct dsi_bridge *dsi_bridge;
+       struct drm_connector *connector;
        int ret;
 
        dsi_bridge = devm_kzalloc(msm_dsi->dev->dev,
                                sizeof(*dsi_bridge), GFP_KERNEL);
        if (!dsi_bridge)
-               return ERR_PTR(-ENOMEM);
+               return -ENOMEM;
 
        dsi_bridge->id = msm_dsi->id;
 
@@ -450,27 +463,9 @@ struct drm_bridge *msm_dsi_manager_bridge_init(struct msm_dsi *msm_dsi,
 
        ret = devm_drm_bridge_add(msm_dsi->dev->dev, bridge);
        if (ret)
-               return ERR_PTR(ret);
-
-       ret = drm_bridge_attach(encoder, bridge, NULL, 0);
-       if (ret)
-               return ERR_PTR(ret);
-
-       return bridge;
-}
-
-int msm_dsi_manager_ext_bridge_init(u8 id, struct drm_bridge *int_bridge)
-{
-       struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
-       struct drm_device *dev = msm_dsi->dev;
-       struct drm_encoder *encoder;
-       struct drm_connector *connector;
-       int ret;
-
-       encoder = int_bridge->encoder;
+               return ret;
 
-       ret = drm_bridge_attach(encoder, msm_dsi->next_bridge, int_bridge,
-                       DRM_BRIDGE_ATTACH_NO_CONNECTOR);
+       ret = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
        if (ret)
                return ret;