[PATCH] drm/etnaviv: add missing failure path to destroy suballoc

[Russell King - ARM Linux admin]

On Thu, Jun 27, 2019 at 04:44:38PM +0200, Lucas Stach wrote:
> When something goes wrong in the GPU init after the cmdbuf suballocator
> has been constructed, we fail to destory it properly. This causes havok
> later when the GPU is unbound due to a module unload or similar.
> 
> Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
Tested-by: Russell King <rmk+kernel at armlinux.org.uk>

Thanks.

> ---
>  drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> index 72d01e873160..5418a1a87b2c 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> @@ -760,7 +760,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
>  	if (IS_ERR(gpu->cmdbuf_suballoc)) {
>  		dev_err(gpu->dev, "Failed to create cmdbuf suballocator\n");
>  		ret = PTR_ERR(gpu->cmdbuf_suballoc);
> -		goto fail;
> +		goto destroy_iommu;
>  	}
>  
>  	/* Create buffer: */
> @@ -768,7 +768,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
>  				  PAGE_SIZE);
>  	if (ret) {
>  		dev_err(gpu->dev, "could not create command buffer\n");
> -		goto destroy_iommu;
> +		goto destroy_suballoc;
>  	}
>  
>  	if (gpu->mmu->version == ETNAVIV_IOMMU_V1 &&
> @@ -800,6 +800,9 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
>  free_buffer:
>  	etnaviv_cmdbuf_free(&gpu->buffer);
>  	gpu->buffer.suballoc = NULL;
> +destroy_suballoc:
> +	etnaviv_cmdbuf_suballoc_destroy(gpu->cmdbuf_suballoc);
> +	gpu->cmdbuf_suballoc = NULL;
>  destroy_iommu:
>  	etnaviv_iommu_destroy(gpu->mmu);
>  	gpu->mmu = NULL;
> -- 
> 2.20.1
> 
> 

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up