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

drm/ttm: nuke ttm_tt_set_(un)populated again 



Neither page allocation backend nor the driver should mess with that.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarMadhav Chauhan <madhav.chauhan@amd.com>
Link: https://patchwork.freedesktop.org/patch/396948/
parent ef52d585

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+0 −2
Original line number Diff line number Diff line
@@ -1363,7 +1363,6 @@ static int amdgpu_ttm_tt_populate(struct ttm_bo_device *bdev, 
			return -ENOMEM;



		ttm->page_flags |= TTM_PAGE_FLAG_SG;

		ttm_tt_set_populated(ttm);

		return 0;

	}
@@ -1383,7 +1382,6 @@ static int amdgpu_ttm_tt_populate(struct ttm_bo_device *bdev, 
		drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,

						 gtt->ttm.dma_address,

						 ttm->num_pages);

		ttm_tt_set_populated(ttm);

		return 0;

	}

drivers/gpu/drm/nouveau/nouveau_bo.c

+0 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,6 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bdev, 
		/* make userspace faulting work */

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

						 ttm_dma->dma_address, ttm->num_pages);

		ttm_tt_set_populated(ttm);

		return 0;

	}

drivers/gpu/drm/radeon/radeon_ttm.c

+0 −2
Original line number Diff line number Diff line
@@ -670,14 +670,12 @@ static int radeon_ttm_tt_populate(struct ttm_bo_device *bdev, 
			return -ENOMEM;



		ttm->page_flags |= TTM_PAGE_FLAG_SG;

		ttm_tt_set_populated(ttm);

		return 0;

	}



	if (slave && ttm->sg) {

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

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

		ttm_tt_set_populated(ttm);

		return 0;

	}

drivers/gpu/drm/ttm/ttm_page_alloc.c

+0 −2
Original line number Diff line number Diff line
@@ -1041,7 +1041,6 @@ ttm_pool_unpopulate_helper(struct ttm_tt *ttm, unsigned mem_count_update) 
put_pages:

	ttm_put_pages(ttm->pages, ttm->num_pages, ttm->page_flags,

		      ttm->caching);

	ttm_tt_set_unpopulated(ttm);

}



int ttm_pool_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)
@@ -1080,7 +1079,6 @@ int ttm_pool_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx) 
		}

	}



	ttm_tt_set_populated(ttm);

	return 0;

}

EXPORT_SYMBOL(ttm_pool_populate);

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

+0 −2
Original line number Diff line number Diff line
@@ -983,7 +983,6 @@ skip_huge: 
		}

	}



	ttm_tt_set_populated(ttm);

	return 0;

}

EXPORT_SYMBOL_GPL(ttm_dma_populate);
@@ -1077,7 +1076,6 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev) 
	/* shrink pool if necessary (only on !is_cached pools)*/

	if (npages)

		ttm_dma_page_pool_free(pool, npages, false);

	ttm_tt_set_unpopulated(ttm);

}

EXPORT_SYMBOL_GPL(ttm_dma_unpopulate);

CRA Git | Maintained and supported by SUSTech CRA and CCSE