| Message ID | 20230306100722.28485-5-johan+linaro@kernel.org |
|---|---|
| State | Accepted |
| Commit | cd459c005de3e2b855a8cc7768e633ce9d018e9f |
| 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: f026e431cf86 ("drm/msm: Convert to Linux IRQ interfaces") > Cc: stable@vger.kernel.org # 5.14 > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/msm_drv.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 17a59d73fe01..2f2bcdb671d2 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -251,9 +251,11 @@ static int msm_drm_uninit(struct device *dev) > drm_bridge_remove(priv->bridges[i]); > priv->num_bridges = 0; > > - pm_runtime_get_sync(dev); > - msm_irq_uninstall(ddev); > - pm_runtime_put_sync(dev); > + if (kms) { > + pm_runtime_get_sync(dev); > + msm_irq_uninstall(ddev); > + pm_runtime_put_sync(dev); > + } > > if (kms && kms->funcs) > kms->funcs->destroy(kms);
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 17a59d73fe01..2f2bcdb671d2 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -251,9 +251,11 @@ static int msm_drm_uninit(struct device *dev) drm_bridge_remove(priv->bridges[i]); priv->num_bridges = 0; - pm_runtime_get_sync(dev); - msm_irq_uninstall(ddev); - pm_runtime_put_sync(dev); + if (kms) { + pm_runtime_get_sync(dev); + msm_irq_uninstall(ddev); + pm_runtime_put_sync(dev); + } if (kms && kms->funcs) kms->funcs->destroy(kms);
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: f026e431cf86 ("drm/msm: Convert to Linux IRQ interfaces") Cc: stable@vger.kernel.org # 5.14 Cc: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/gpu/drm/msm/msm_drv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)