Re: [Freedreno] [PATCH 05/10] drm/msm: fix drm device leak on bind errors
On Wed, 22 Mar 2023 at 09:46, Johan Hovold wrote: > > On Tue, Mar 21, 2023 at 04:54:51PM +0200, Dmitry Baryshkov wrote: > > On 06/03/2023 12:07, Johan Hovold wrote: > > > Make sure to free the DRM device also in case of early errors during > > > bind(). > > > > > > Fixes: 2027e5b3413d ("drm/msm: Initialize MDSS irq domain at probe time") > > > Cc: sta...@vger.kernel.org # 5.17 > > > Cc: Dmitry Baryshkov > > > Signed-off-by: Johan Hovold > > > > Can we migrate to devm_drm_dev_alloc instead() ? Will it make code > > simpler and/or easier to handle? > > I'm just fixing the bugs here. Cleanups/rework like that can be done on > top but should not be backported as it risks introducing new issues. Reviewed-by: Dmitry Baryshkov -- With best wishes Dmitry
Re: [Freedreno] [PATCH 05/10] drm/msm: fix drm device leak on bind errors
On Tue, Mar 21, 2023 at 04:54:51PM +0200, Dmitry Baryshkov wrote: > On 06/03/2023 12:07, Johan Hovold wrote: > > Make sure to free the DRM device also in case of early errors during > > bind(). > > > > Fixes: 2027e5b3413d ("drm/msm: Initialize MDSS irq domain at probe time") > > Cc: sta...@vger.kernel.org # 5.17 > > Cc: Dmitry Baryshkov > > Signed-off-by: Johan Hovold > > Can we migrate to devm_drm_dev_alloc instead() ? Will it make code > simpler and/or easier to handle? I'm just fixing the bugs here. Cleanups/rework like that can be done on top but should not be backported as it risks introducing new issues. Johan
Re: [Freedreno] [PATCH 05/10] drm/msm: fix drm device leak on bind errors
On 06/03/2023 12:07, Johan Hovold wrote: Make sure to free the DRM device also in case of early errors during bind(). Fixes: 2027e5b3413d ("drm/msm: Initialize MDSS irq domain at probe time") Cc: sta...@vger.kernel.org # 5.17 Cc: Dmitry Baryshkov Signed-off-by: Johan Hovold Can we migrate to devm_drm_dev_alloc instead() ? Will it make code simpler and/or easier to handle? --- drivers/gpu/drm/msm/msm_drv.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 2f2bcdb671d2..89634159ad75 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -444,12 +444,12 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) ret = msm_init_vram(ddev); if (ret) - return ret; + goto err_put_dev; /* Bind all our sub-components: */ ret = component_bind_all(dev, ddev); if (ret) - return ret; + goto err_put_dev; dma_set_max_seg_size(dev, UINT_MAX); @@ -544,6 +544,12 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) err_msm_uninit: msm_drm_uninit(dev); + + return ret; + +err_put_dev: + drm_dev_put(ddev); + return ret; } -- With best wishes Dmitry