Commit 43d46f0b authored by Matthew Auld's avatar Matthew Auld Committed by Christian König
Browse files

drm/ttm: s/FLAG_SG/FLAG_EXTERNAL/ 



It covers more than just ttm_bo_type_sg usage, like with say dma-buf,
since one other user is userptr in amdgpu, and in the future we might
have some more. Hence EXTERNAL is likely a more suitable name.

v2(Christian):
  - Rename these to TTM_TT_FLAGS_*
  - Fix up all the holes in the flag values

Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Christian König <christian.koenig@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210929132629.353541-1-matthew.auld@intel.com


Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent d0f5d790

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

+5 −5
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, 
			DRM_ERROR("failed to pin userptr\n");

			return r;

		}

	} else if (ttm->page_flags & TTM_PAGE_FLAG_SG) {

	} else if (ttm->page_flags & TTM_TT_FLAG_EXTERNAL) {

		if (!ttm->sg) {

			struct dma_buf_attachment *attach;

			struct sg_table *sgt;
@@ -1130,7 +1130,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_device *bdev, 
		return 0;

	}



	if (ttm->page_flags & TTM_PAGE_FLAG_SG)

	if (ttm->page_flags & TTM_TT_FLAG_EXTERNAL)

		return 0;



	ret = ttm_pool_alloc(&adev->mman.bdev.pool, ttm, ctx);
@@ -1165,7 +1165,7 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_device *bdev, 
		return;

	}



	if (ttm->page_flags & TTM_PAGE_FLAG_SG)

	if (ttm->page_flags & TTM_TT_FLAG_EXTERNAL)

		return;



	for (i = 0; i < ttm->num_pages; ++i)
@@ -1198,8 +1198,8 @@ int amdgpu_ttm_tt_set_userptr(struct ttm_buffer_object *bo, 
			return -ENOMEM;

	}



	/* Set TTM_PAGE_FLAG_SG before populate but after create. */

	bo->ttm->page_flags |= TTM_PAGE_FLAG_SG;

	/* Set TTM_TT_FLAG_EXTERNAL before populate but after create. */

	bo->ttm->page_flags |= TTM_TT_FLAG_EXTERNAL;



	gtt = (void *)bo->ttm;

	gtt->userptr = addr;

drivers/gpu/drm/i915/gem/i915_gem_ttm.c

+3 −3
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static struct ttm_tt *i915_ttm_tt_create(struct ttm_buffer_object *bo, 


	if (obj->flags & I915_BO_ALLOC_CPU_CLEAR &&

	    man->use_tt)

		page_flags |= TTM_PAGE_FLAG_ZERO_ALLOC;

		page_flags |= TTM_TT_FLAG_ZERO_ALLOC;



	ret = ttm_tt_init(&i915_tt->ttm, bo, page_flags,

			  i915_ttm_select_tt_caching(obj));
@@ -451,7 +451,7 @@ static int i915_ttm_accel_move(struct ttm_buffer_object *bo, 
		if (bo->type == ttm_bo_type_kernel)

			return -EINVAL;



		if (ttm && !(ttm->page_flags & TTM_PAGE_FLAG_ZERO_ALLOC))

		if (ttm && !(ttm->page_flags & TTM_TT_FLAG_ZERO_ALLOC))

			return 0;



		intel_engine_pm_get(i915->gt.migrate.context->engine);
@@ -525,7 +525,7 @@ static int i915_ttm_move(struct ttm_buffer_object *bo, bool evict, 


	/* Populate ttm with pages if needed. Typically system memory. */

	if (bo->ttm && (dst_man->use_tt ||

			(bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED))) {

			(bo->ttm->page_flags & TTM_TT_FLAG_SWAPPED))) {

		ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);

		if (ret)

			return ret;

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ nouveau_ttm_tt_populate(struct ttm_device *bdev, 
	struct ttm_tt *ttm_dma = (void *)ttm;

	struct nouveau_drm *drm;

	struct device *dev;

	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);

	bool slave = !!(ttm->page_flags & TTM_TT_FLAG_EXTERNAL);



	if (ttm_tt_is_populated(ttm))

		return 0;
@@ -1272,7 +1272,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_device *bdev, 
{

	struct nouveau_drm *drm;

	struct device *dev;

	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);

	bool slave = !!(ttm->page_flags & TTM_TT_FLAG_EXTERNAL);



	if (slave)

		return;

drivers/gpu/drm/radeon/radeon_ttm.c

+4 −4
Original line number Diff line number Diff line
@@ -545,14 +545,14 @@ static int radeon_ttm_tt_populate(struct ttm_device *bdev, 
{

	struct radeon_device *rdev = radeon_get_rdev(bdev);

	struct radeon_ttm_tt *gtt = radeon_ttm_tt_to_gtt(rdev, ttm);

	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);

	bool slave = !!(ttm->page_flags & TTM_TT_FLAG_EXTERNAL);



	if (gtt && gtt->userptr) {

		ttm->sg = kzalloc(sizeof(struct sg_table), GFP_KERNEL);

		if (!ttm->sg)

			return -ENOMEM;



		ttm->page_flags |= TTM_PAGE_FLAG_SG;

		ttm->page_flags |= TTM_TT_FLAG_EXTERNAL;

		return 0;

	}
@@ -569,13 +569,13 @@ static void radeon_ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm 
{

	struct radeon_device *rdev = radeon_get_rdev(bdev);

	struct radeon_ttm_tt *gtt = radeon_ttm_tt_to_gtt(rdev, ttm);

	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);

	bool slave = !!(ttm->page_flags & TTM_TT_FLAG_EXTERNAL);



	radeon_ttm_tt_unbind(bdev, ttm);



	if (gtt && gtt->userptr) {

		kfree(ttm->sg);

		ttm->page_flags &= ~TTM_PAGE_FLAG_SG;

		ttm->page_flags &= ~TTM_TT_FLAG_EXTERNAL;

		return;

	}

drivers/gpu/drm/ttm/ttm_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -1115,8 +1115,8 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, 
		return -EBUSY;



	if (!bo->ttm || !ttm_tt_is_populated(bo->ttm) ||

	    bo->ttm->page_flags & TTM_PAGE_FLAG_SG ||

	    bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED ||

	    bo->ttm->page_flags & TTM_TT_FLAG_EXTERNAL ||

	    bo->ttm->page_flags & TTM_TT_FLAG_SWAPPED ||

	    !ttm_bo_get_unless_zero(bo)) {

		if (locked)

			dma_resv_unlock(bo->base.resv);