diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-04 09:35:57 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-06 14:10:09 +0100 |
commit | bbc920fb320f1c241cc34ac85edaa0058922246a (patch) | |
tree | e9785393dcb83fe2f7a929f837954629cf441cba | |
parent | 6d67b2a73b8e3a079c355bab3c1aef7d85a044b8 (diff) | |
download | linux-stable-bbc920fb320f1c241cc34ac85edaa0058922246a.tar.gz linux-stable-bbc920fb320f1c241cc34ac85edaa0058922246a.tar.bz2 linux-stable-bbc920fb320f1c241cc34ac85edaa0058922246a.zip |
Revert "drm/ttm: fix memleak in ttm_transfered_destroy"
This reverts commit c21b4002214c1c7e7b627b9b53375612f7aab6db which is
commit 0db55f9a1bafbe3dac750ea669de9134922389b5 upstream.
Seems that the older kernels can not handle this fix because, to quote
Christian:
The problem is this memory leak could potentially happen with
5.10 as wel, just much much much less likely.
But my guess is that 5.10 is so buggy that when the leak does
NOT happen we double free and obviously causing a crash.
So it needs to be reverted.
Link: https://lore.kernel.org/r/1a1cc125-9314-f569-a6c4-40fc4509a377@amd.com
Cc: Christian König <christian.koenig@amd.com>
Cc: Erhard F. <erhard_f@mailbox.org>
Cc: Erhard F. <erhard_f@mailbox.org>
Cc: Huang Rui <ray.huang@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 8fba425a7626..fb2a25f8408f 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -322,7 +322,6 @@ static void ttm_transfered_destroy(struct ttm_buffer_object *bo) struct ttm_transfer_obj *fbo; fbo = container_of(bo, struct ttm_transfer_obj, base); - dma_resv_fini(&fbo->base.base._resv); ttm_bo_put(fbo->bo); kfree(fbo); } |