drm/msm/dsi: Set msm_dsi->encoders before initializing bridge
PATCH 1/1 drm/msm/dsi: Set msm_dsi->encoders before initializing bridge
The commit "drm: bridge: Link encoder and bridge in core code" updated the drm_bridge_attach() API to also include the drm_encoder pointer the bridge attaches to.
The func msm_dsi_manager_bridge_init() now relies on the drm_encoder pointer stored in msm_dsi->encoders to pass the encoder to the bridge API.
msm_dsi->encoders is unfortunately set after this function is called, resulting in us passing a NULL pointer to drm_brigde_attach. This results in an error and the DSI driver probe fails.
Move the initialization of msm_dsi->encoders[] a bit up. Also, don't try to set the encoder's bridge. That's now managed by the bridge API.
--- drivers/gpu/drm/msm/dsi/dsi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.c +3 -5
@@ -205,6 +205,9 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } +for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) + msm_dsi->encoders[i] = encoders[i]; + msm_dsi->bridge =msm_dsi_manager_bridge_init (msm_dsi->id);if (IS_ERR (msm_dsi->bridge)) { ret =PTR_ERR (msm_dsi->bridge);
@@ -213,11 +216,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) { - encoders[i]->bridge = msm_dsi->bridge; - msm_dsi->encoders[i] = encoders[i]; - } -/* * check if the dsi encoder output is connected to a panel or an * external bridge. We create a connector only if we're connected to a
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Hi Archit,
Thank you for the patch.
Quoted 12 lines · On Wednesday 11 Jan 2017 12:09:51 Archit Taneja wrote:
The commit "drm: bridge: Link encoder and bridge in core code" updated the
drm_bridge_attach()API to also include thedrm_encoderpointer the bridge attaches to.The func
msm_dsi_manager_bridge_init()now relies on thedrm_encoderpointer stored inmsm_dsi->encodersto pass the encoder to the bridge API.
msm_dsi->encodersis unfortunately set after this function is called, resulting in us passing a NULL pointer todrm_brigde_attach. This results in an error and the DSI driver probe fails.
Quoted 5 lines
Move the initialization of msm_dsi->encoders[] a bit up. Also, don't try to set the encoder's bridge. That's now managed by the bridge API.
Cc Laurent Pinchart <[email protected]>
Sorry for having missed that :-(
Quoted 31 lines
Signed-off-by Archit Taneja <[email protected]>--- drivers/gpu/drm/msm/dsi/dsi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/gpu/drm/msm/dsi/dsi.c +3
-5@@ -205,6 +205,9 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } +for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) + msm_dsi->encoders[i] = encoders[i]; + msm_dsi->bridge =msm_dsi_manager_bridge_init (msm_dsi->id);if (IS_ERR (msm_dsi->bridge)) { ret =PTR_ERR (msm_dsi->bridge);@@ -213,11 +216,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } -for (i =0 ; i <MSM_DSI_ENCODER_NUM ; i++) { - encoders[i]->bridge = msm_dsi->bridge; - msm_dsi->encoders[i] = encoders[i]; - } -/* * check if the dsi encoder output is connected to a panel or an * external bridge. We create a connector only if we're connected to a
Signature · 8 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel