Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db12973c authored by monk.liu's avatar monk.liu Committed by Alex Deucher
Browse files

drm/radeon: fix userptr BO unpin bug v3 



Fixing a memory leak with userptrs.

v2: clean up the loop, use an iterator instead
v3: remove unused variable

Signed-off-by: default avatarmonk.liu <monk.liu@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
CC: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d73a824a

drivers/gpu/drm/radeon/radeon_ttm.c

+3 −5
Original line number Diff line number Diff line
@@ -591,8 +591,7 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm) 
{

	struct radeon_device *rdev = radeon_get_rdev(ttm->bdev);

	struct radeon_ttm_tt *gtt = (void *)ttm;

	struct scatterlist *sg;

	int i;

	struct sg_page_iter sg_iter;



	int write = !(gtt->userflags & RADEON_GEM_USERPTR_READONLY);

	enum dma_data_direction direction = write ?
@@ -605,9 +604,8 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm) 
	/* free the sg table and pages again */

	dma_unmap_sg(rdev->dev, ttm->sg->sgl, ttm->sg->nents, direction);



	for_each_sg(ttm->sg->sgl, sg, ttm->sg->nents, i) {

		struct page *page = sg_page(sg);



	for_each_sg_page(ttm->sg->sgl, &sg_iter, ttm->sg->nents, 0) {

		struct page *page = sg_page_iter_page(&sg_iter);

		if (!(gtt->userflags & RADEON_GEM_USERPTR_READONLY))

			set_page_dirty(page);