| Message ID | 20220913085320.8577-11-johan+linaro@kernel.org |
|---|---|
| State | Accepted |
| Commit | e512ed607fdac79b25448d4f2a4a8e8b6d546a02 |
| Headers | show |
| Series | drm/msm: probe deferral fixes | expand |
On 9/13/2022 1:53 AM, Johan Hovold wrote: > Drop the overly defensive modeset sanity checks of function parameters > which have already been checked or used by the callers. > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> The change LGTM, hence Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> I think we can use below fixes tag so that we can pick up this entire series for the fixes cycle. Fixes: 3f0689e66352 ("drm/msm/dsi: check msm_dsi and dsi pointers before use") > --- > drivers/gpu/drm/msm/dsi/dsi.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c > index 8a95c744972a..31fdee2052be 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi.c > +++ b/drivers/gpu/drm/msm/dsi/dsi.c > @@ -211,14 +211,9 @@ 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 msm_drm_private *priv; > + struct msm_drm_private *priv = dev->dev_private; > int ret; > > - if (WARN_ON(!encoder) || WARN_ON(!msm_dsi) || WARN_ON(!dev)) > - return -EINVAL; > - > - priv = dev->dev_private; > - > if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) { > DRM_DEV_ERROR(dev->dev, "too many bridges\n"); > return -ENOSPC;
On Mon, Sep 26, 2022 at 11:21:38AM -0700, Abhinav Kumar wrote: > > > On 9/13/2022 1:53 AM, Johan Hovold wrote: > > Drop the overly defensive modeset sanity checks of function parameters > > which have already been checked or used by the callers. > > > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > > The change LGTM, hence > > Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > > I think we can use below fixes tag so that we can pick up this entire > series for the fixes cycle. > > Fixes: 3f0689e66352 ("drm/msm/dsi: check msm_dsi and dsi pointers before > use") Same here. I wouldn't add a Fixes tag unless required by some DRM process. Johan
On 9/27/2022 12:16 AM, Johan Hovold wrote: > On Mon, Sep 26, 2022 at 11:21:38AM -0700, Abhinav Kumar wrote: >> >> >> On 9/13/2022 1:53 AM, Johan Hovold wrote: >>> Drop the overly defensive modeset sanity checks of function parameters >>> which have already been checked or used by the callers. >>> >>> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >>> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> >> >> The change LGTM, hence >> >> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> >> >> I think we can use below fixes tag so that we can pick up this entire >> series for the fixes cycle. >> >> Fixes: 3f0689e66352 ("drm/msm/dsi: check msm_dsi and dsi pointers before >> use") > > Same here. I wouldn't add a Fixes tag unless required by some DRM > process. > > Johan Same response as the prev one, we will apply everything except the last two patches of this series in the -fixes and take these two for the next kernel rev push.
diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 8a95c744972a..31fdee2052be 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -211,14 +211,9 @@ 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 msm_drm_private *priv; + struct msm_drm_private *priv = dev->dev_private; int ret; - if (WARN_ON(!encoder) || WARN_ON(!msm_dsi) || WARN_ON(!dev)) - return -EINVAL; - - priv = dev->dev_private; - if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) { DRM_DEV_ERROR(dev->dev, "too many bridges\n"); return -ENOSPC;