Commit 470cfe71 authored Oct 09, 2020 by Christian König

drm/nouveau: stop using pages with drm_prime_sg_to_page_addr_arrays v2



This is deprecated, also drop the comment about faults.

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

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/403835/

parent 4e7b9000

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1235,9 +1235,9 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bdev,
		return 0;

		if (slave && ttm->sg) {
		/* make userspace faulting work */
		drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,
		ttm_dma->dma_address, ttm->num_pages);
		drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL,
		ttm_dma->dma_address,
		ttm->num_pages);
		return 0;
		}

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ nouveau_sgdma_create_ttm(struct ttm_buffer_object *bo, uint32_t page_flags)
		if (!nvbe)
		return NULL;

		if (ttm_dma_tt_init(&nvbe->ttm, bo, page_flags, caching)) {
		if (ttm_sg_tt_init(&nvbe->ttm, bo, page_flags, caching)) {
		kfree(nvbe);
		return NULL;
		}