| Message ID | 20230306100722.28485-4-johan+linaro@kernel.org |
|---|---|
| State | Accepted |
| Commit | a465353b9250802f87b97123e33a17f51277f0b1 |
| Headers | show |
| Series | drm/msm: fix bind error handling | expand |
On 06/03/2023 12:07, Johan Hovold wrote: > In case of early initialisation errors and on platforms that do not use > the DPU controller, the deinitilisation code can be called with the kms > pointer set to NULL. > > Fixes: 98659487b845 ("drm/msm: add support to take dpu snapshot") > Cc: stable@vger.kernel.org # 5.14 > Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/msm_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 9ded384acba4..17a59d73fe01 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -242,7 +242,8 @@ static int msm_drm_uninit(struct device *dev) > msm_fbdev_free(ddev); > #endif > > - msm_disp_snapshot_destroy(ddev); > + if (kms) > + msm_disp_snapshot_destroy(ddev); > > drm_mode_config_cleanup(ddev); >
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 9ded384acba4..17a59d73fe01 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -242,7 +242,8 @@ static int msm_drm_uninit(struct device *dev) msm_fbdev_free(ddev); #endif - msm_disp_snapshot_destroy(ddev); + if (kms) + msm_disp_snapshot_destroy(ddev); drm_mode_config_cleanup(ddev);
In case of early initialisation errors and on platforms that do not use the DPU controller, the deinitilisation code can be called with the kms pointer set to NULL. Fixes: 98659487b845 ("drm/msm: add support to take dpu snapshot") Cc: stable@vger.kernel.org # 5.14 Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/gpu/drm/msm/msm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)