Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be132e13 authored by Lucas Stach's avatar Lucas Stach
Browse files

drm/etnaviv: add missing failure path to destroy suballoc 



When something goes wrong in the GPU init after the cmdbuf suballocator
has been constructed, we fail to destroy it properly. This causes havok
later when the GPU is unbound due to a module unload or similar.

Fixes: e66774dd (drm/etnaviv: add cmdbuf suballocator)
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Tested-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent a188339c

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+5 −2
Original line number Diff line number Diff line
@@ -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;