| From 8c8c06207bcfc5a7e5918fc0a0f7f7b9a2e196d6 Mon Sep 17 00:00:00 2001 |
| From: Ahzo <Ahzo@tutanota.com> |
| Date: Tue, 25 Feb 2020 13:56:14 -0500 |
| Subject: drm/ttm: fix leaking fences via ttm_buffer_object_transfer |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Ahzo <Ahzo@tutanota.com> |
| |
| commit 8c8c06207bcfc5a7e5918fc0a0f7f7b9a2e196d6 upstream. |
| |
| Set the drm_device to NULL, so that the newly created buffer object |
| doesn't appear to use the embedded gem object. |
| |
| This is necessary, because otherwise no corresponding dma_resv_fini for |
| the dma_resv_init is called, resulting in a memory leak. |
| |
| The dma_resv_fini in ttm_bo_release_list is only called if the embedded |
| gem object is not used, which is determined by checking if the |
| drm_device is NULL. |
| |
| Bug: https://gitlab.freedesktop.org/drm/amd/issues/958 |
| Fixes: 1e053b10ba60 ("drm/ttm: use gem reservation object") |
| Reviewed-by: Christian König <christian.koenig@amd.com> |
| Signed-off-by: Ahzo <Ahzo@tutanota.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Christian König <christian.koenig@amd.com> |
| Link: https://patchwork.freedesktop.org/patch/355089/ |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/gpu/drm/ttm/ttm_bo_util.c |
| +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c |
| @@ -516,6 +516,7 @@ static int ttm_buffer_object_transfer(st |
| fbo->base.base.resv = &fbo->base.base._resv; |
| |
| dma_resv_init(&fbo->base.base._resv); |
| + fbo->base.base.dev = NULL; |
| ret = dma_resv_trylock(&fbo->base.base._resv); |
| WARN_ON(!ret); |
| |