mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-28 17:51:40 +00:00
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
From 45d16a6d94580cd3c6baed69b5fe441ece599fc4 Mon Sep 17 00:00:00 2001
|
|
From: Lucas Stach <l.stach@pengutronix.de>
|
|
Date: Mon, 25 Jan 2016 12:41:05 +0100
|
|
Subject: [PATCH] drm/etnaviv: fix memory leak in IOMMU init path
|
|
|
|
Plug in error handling to free any allocated ressources in the
|
|
IOMMU init path.
|
|
|
|
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
|
|
---
|
|
drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
|
|
index 7b511ad..a33162c 100644
|
|
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
|
|
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
|
|
@@ -596,10 +596,9 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
|
|
goto fail;
|
|
}
|
|
|
|
- /* TODO: we will leak here memory - fix it! */
|
|
-
|
|
gpu->mmu = etnaviv_iommu_new(gpu, iommu, version);
|
|
if (!gpu->mmu) {
|
|
+ iommu_domain_free(iommu);
|
|
ret = -ENOMEM;
|
|
goto fail;
|
|
}
|
|
@@ -609,7 +608,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
|
|
if (!gpu->buffer) {
|
|
ret = -ENOMEM;
|
|
dev_err(gpu->dev, "could not create command buffer\n");
|
|
- goto fail;
|
|
+ goto destroy_iommu;
|
|
}
|
|
if (gpu->buffer->paddr - gpu->memory_base > 0x80000000) {
|
|
ret = -EINVAL;
|
|
@@ -639,6 +638,9 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
|
|
free_buffer:
|
|
etnaviv_gpu_cmdbuf_free(gpu->buffer);
|
|
gpu->buffer = NULL;
|
|
+destroy_iommu:
|
|
+ etnaviv_iommu_destroy(gpu->mmu);
|
|
+ gpu->mmu = NULL;
|
|
fail:
|
|
pm_runtime_mark_last_busy(gpu->dev);
|
|
pm_runtime_put_autosuspend(gpu->dev);
|
|
--
|
|
2.7.0.rc3
|
|
|