drm/etnaviv: add missing failure path to destroy suballoc

commit be132e1375c1fffe48801296279079f8a59a9ed3 upstream.

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: e66774dd6f6a (drm/etnaviv: add cmdbuf suballocator)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Tested-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 6904535475de1828efc6a273612e4da7ad3284b6..4cf44575a27bb2cfbdd71538acdfe87bf00b6b03 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -762,7 +762,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: */
@@ -770,7 +770,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 &&
@@ -802,6 +802,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;