Commit 0575ff3d authored by Christian König's avatar Christian König
Browse files

drm/radeon: stop using pages with drm_prime_sg_to_page_addr_arrays v2 



This is deprecated.

v2: also use ttm_sg_tt_init to avoid allocating the page array.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/403832/
parent f5ca8eb6

drivers/gpu/drm/radeon/radeon_ttm.c

+6 −5
Original line number Diff line number Diff line
@@ -395,8 +395,8 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_bo_device *bdev, struct ttm_tt * 
	if (r)

		goto release_sg;



	drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,

					 gtt->ttm.dma_address, ttm->num_pages);

	drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, gtt->ttm.dma_address,

					 ttm->num_pages);



	return 0;
@@ -536,7 +536,7 @@ static struct ttm_tt *radeon_ttm_tt_create(struct ttm_buffer_object *bo, 
	else

		caching = ttm_cached;



	if (ttm_dma_tt_init(&gtt->ttm, bo, page_flags, caching)) {

	if (ttm_sg_tt_init(&gtt->ttm, bo, page_flags, caching)) {

		kfree(gtt);

		return NULL;

	}
@@ -574,8 +574,9 @@ static int radeon_ttm_tt_populate(struct ttm_bo_device *bdev, 
	}



	if (slave && ttm->sg) {

		drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,

						 gtt->ttm.dma_address, ttm->num_pages);

		drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL,

						 gtt->ttm.dma_address,

						 ttm->num_pages);

		return 0;

	}