| Message ID | 20220318000731.2823718-1-swboyd@chromium.org |
|---|---|
| State | Accepted |
| Commit | 47b7de6b88b962ef339a2427a023d2a23d161654 |
| Headers | show |
| Series | drm/msm/dsi: Use connector directly in msm_dsi_manager_connector_init() | expand |
On 3/17/2022 5:07 PM, Stephen Boyd wrote: > The member 'msm_dsi->connector' isn't assigned until > msm_dsi_manager_connector_init() returns (see msm_dsi_modeset_init() and > how it assigns the return value). Therefore this pointer is going to be > NULL here. Let's use 'connector' which is what was intended. > > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Cc: Sean Paul <seanpaul@chromium.org> > Fixes: 6d5e78406991 ("drm/msm/dsi: Move dsi panel init into modeset init path") > Signed-off-by: Stephen Boyd <swboyd@chromium.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- > > I don't know if this is superseeded by something else but I found this > while trying to use the connector from msm_dsi in this function. > > drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c > index 0c1b7dde377c..9f6af0f0fe00 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c > @@ -638,7 +638,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) > return connector; > > fail: > - connector->funcs->destroy(msm_dsi->connector); > + connector->funcs->destroy(connector); > return ERR_PTR(ret); > } > > > base-commit: 05afd57f4d34602a652fdaf58e0a2756b3c20fd4
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 0c1b7dde377c..9f6af0f0fe00 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -638,7 +638,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id) return connector; fail: - connector->funcs->destroy(msm_dsi->connector); + connector->funcs->destroy(connector); return ERR_PTR(ret); }
The member 'msm_dsi->connector' isn't assigned until msm_dsi_manager_connector_init() returns (see msm_dsi_modeset_init() and how it assigns the return value). Therefore this pointer is going to be NULL here. Let's use 'connector' which is what was intended. Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: Sean Paul <seanpaul@chromium.org> Fixes: 6d5e78406991 ("drm/msm/dsi: Move dsi panel init into modeset init path") Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- I don't know if this is superseeded by something else but I found this while trying to use the connector from msm_dsi in this function. drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 05afd57f4d34602a652fdaf58e0a2756b3c20fd4