Commit 60d476af authored by Johan Hovold's avatar Johan Hovold Committed by Dmitry Baryshkov
Browse files

drm/msm: fix vram leak on bind errors 



Make sure to release the VRAM buffer also in a case a subcomponent fails
to bind.

Fixes: d863f0c7 ("drm/msm: Call msm_init_vram before binding the gpu")
Cc: stable@vger.kernel.org      # 5.11
Cc: Craig Tatlor <ctatlor97@gmail.com>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/525094/
Link: https://lore.kernel.org/r/20230306100722.28485-7-johan+linaro@kernel.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 214b09db

drivers/gpu/drm/msm/msm_drv.c

+19 −7
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 
#define MSM_VERSION_MINOR	10

#define MSM_VERSION_PATCHLEVEL	0



static void msm_deinit_vram(struct drm_device *ddev);



static const struct drm_mode_config_funcs mode_config_funcs = {

	.fb_create = msm_framebuffer_create,

	.output_poll_changed = drm_fb_helper_output_poll_changed,
@@ -261,12 +263,7 @@ static int msm_drm_uninit(struct device *dev) 
	if (kms && kms->funcs)

		kms->funcs->destroy(kms);



	if (priv->vram.paddr) {

		unsigned long attrs = DMA_ATTR_NO_KERNEL_MAPPING;

		drm_mm_takedown(&priv->vram.mm);

		dma_free_attrs(dev, priv->vram.size, NULL,

			       priv->vram.paddr, attrs);

	}

	msm_deinit_vram(ddev);



	component_unbind_all(dev, ddev);
@@ -404,6 +401,19 @@ static int msm_init_vram(struct drm_device *dev) 
	return ret;

}



static void msm_deinit_vram(struct drm_device *ddev)

{

	struct msm_drm_private *priv = ddev->dev_private;

	unsigned long attrs = DMA_ATTR_NO_KERNEL_MAPPING;



	if (!priv->vram.paddr)

		return;



	drm_mm_takedown(&priv->vram.mm);

	dma_free_attrs(ddev->dev, priv->vram.size, NULL, priv->vram.paddr,

			attrs);

}



static int msm_drm_init(struct device *dev, const struct drm_driver *drv)

{

	struct msm_drm_private *priv = dev_get_drvdata(dev);
@@ -450,7 +460,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 
	/* Bind all our sub-components: */

	ret = component_bind_all(dev, ddev);

	if (ret)

		goto err_put_dev;

		goto err_deinit_vram;



	dma_set_max_seg_size(dev, UINT_MAX);
@@ -548,6 +558,8 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 


	return ret;



err_deinit_vram:

	msm_deinit_vram(ddev);

err_put_dev:

	drm_dev_put(ddev);