drm/radeon/ttm: Fix memory leak userptr pages
authorDaniel Gomez <daniel@qtec.com>
Thu, 18 Mar 2021 08:32:36 +0000 (09:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 May 2021 12:47:30 +0000 (14:47 +0200)
[ Upstream commit 5aeaa43e0ef1006320c077cbc49f4a8229ca3460 ]

If userptr pages have been pinned but not bounded,
they remain uncleared.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Daniel Gomez <daniel@qtec.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/radeon/radeon_ttm.c

index 36150b7..a65cb34 100644 (file)
@@ -566,13 +566,14 @@ static void radeon_ttm_backend_unbind(struct ttm_bo_device *bdev, struct ttm_tt
        struct radeon_ttm_tt *gtt = (void *)ttm;
        struct radeon_device *rdev = radeon_get_rdev(bdev);
 
+       if (gtt->userptr)
+               radeon_ttm_tt_unpin_userptr(bdev, ttm);
+
        if (!gtt->bound)
                return;
 
        radeon_gart_unbind(rdev, gtt->offset, ttm->num_pages);
 
-       if (gtt->userptr)
-               radeon_ttm_tt_unpin_userptr(bdev, ttm);
        gtt->bound = false;
 }