Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/msm/dsi: move next bridge acquisition to dsi_bind
Currently the MSM DSI driver looks for the next bridge during
msm_dsi_modeset_init(). If the bridge is not registered at that point,
this might result in -EPROBE_DEFER, which can be problematic that late
during the device probe process. Move next bridge acquisition to the
dsi_bind state so that probe deferral is returned as early as possible.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/582210/
Link: https://lore.kernel.org/r/20240309-fd-dsi-cleanup-bridges-v1-2-962ebdba82ed@linaro.org
+19
-7
+16
drivers/gpu/drm/msm/dsi/dsi.c
+16
drivers/gpu/drm/msm/dsi/dsi.c
···
120
120
struct msm_drm_private *priv = dev_get_drvdata(master);
121
121
struct msm_dsi *msm_dsi = dev_get_drvdata(dev);
122
122
123
+
/*
124
+
* Next bridge doesn't exist for the secondary DSI host in a bonded
125
+
* pair.
126
+
*/
127
+
if (!msm_dsi_is_bonded_dsi(msm_dsi) ||
128
+
msm_dsi_is_master_dsi(msm_dsi)) {
129
+
struct drm_bridge *ext_bridge;
130
+
131
+
ext_bridge = devm_drm_of_get_bridge(&msm_dsi->pdev->dev,
132
+
msm_dsi->pdev->dev.of_node, 1, 0);
133
+
if (IS_ERR(ext_bridge))
134
+
return PTR_ERR(ext_bridge);
135
+
136
+
msm_dsi->next_bridge = ext_bridge;
137
+
}
138
+
123
139
priv->dsi[msm_dsi->id] = msm_dsi;
124
140
125
141
return 0;
+2
drivers/gpu/drm/msm/dsi/dsi.h
+2
drivers/gpu/drm/msm/dsi/dsi.h
+1
-7
drivers/gpu/drm/msm/dsi/dsi_manager.c
+1
-7
drivers/gpu/drm/msm/dsi/dsi_manager.c
···
464
464
struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
465
465
struct drm_device *dev = msm_dsi->dev;
466
466
struct drm_encoder *encoder;
467
-
struct drm_bridge *ext_bridge;
468
467
struct drm_connector *connector;
469
468
int ret;
470
469
471
-
ext_bridge = devm_drm_of_get_bridge(&msm_dsi->pdev->dev,
472
-
msm_dsi->pdev->dev.of_node, 1, 0);
473
-
if (IS_ERR(ext_bridge))
474
-
return PTR_ERR(ext_bridge);
475
-
476
470
encoder = int_bridge->encoder;
477
471
478
-
ret = drm_bridge_attach(encoder, ext_bridge, int_bridge,
472
+
ret = drm_bridge_attach(encoder, msm_dsi->next_bridge, int_bridge,
479
473
DRM_BRIDGE_ATTACH_NO_CONNECTOR);
480
474
if (ret)
481
475
return ret;