[PATCH] drm/amdgpu: free userptrs even if GTT isn't bound

Thu, 22 Sep 2016 06:29:56 -0700 

From: Christian König <[email protected]>

This fixes a memory leak since binding GTT only on demand.

Signed-off-by: Christian König <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 219f056..ce9da20 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -758,6 +758,9 @@ static int amdgpu_ttm_backend_unbind(struct ttm_tt *ttm)
 {
        struct amdgpu_ttm_tt *gtt = (void *)ttm;
 
+       if (gtt->userptr)
+               amdgpu_ttm_tt_unpin_userptr(ttm);
+
        if (!amdgpu_ttm_is_bound(ttm))
                return 0;
 
@@ -765,9 +768,6 @@ static int amdgpu_ttm_backend_unbind(struct ttm_tt *ttm)
        if (gtt->adev->gart.ready)
                amdgpu_gart_unbind(gtt->adev, gtt->offset, ttm->num_pages);
 
-       if (gtt->userptr)
-               amdgpu_ttm_tt_unpin_userptr(ttm);
-
        spin_lock(&gtt->adev->gtt_list_lock);
        list_del_init(&gtt->list);
        spin_unlock(&gtt->adev->gtt_list_lock);
-- 
2.5.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to