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

Commit 19be5570 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: add operation ctx to ttm_bo_validate v2 



Give moving a BO into place an operation context to work with.

v2: rebased

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Tested-by: default avatarDieter Nützel <Dieter@nuetzel-hh.de>
Tested-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 750a2503

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

+8 −6
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p, 
				 struct amdgpu_bo *bo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	struct ttm_operation_ctx ctx = { true, false };

	u64 initial_bytes_moved, bytes_moved;

	uint32_t domain;

	int r;
@@ -374,7 +375,7 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p, 
retry:

	amdgpu_ttm_placement_from_domain(bo, domain);

	initial_bytes_moved = atomic64_read(&adev->num_bytes_moved);

	r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false);

	r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

	bytes_moved = atomic64_read(&adev->num_bytes_moved) -

		      initial_bytes_moved;

	p->bytes_moved += bytes_moved;
@@ -396,6 +397,7 @@ static bool amdgpu_cs_try_evict(struct amdgpu_cs_parser *p, 
				struct amdgpu_bo *validated)

{

	uint32_t domain = validated->allowed_domains;

	struct ttm_operation_ctx ctx = { true, false };

	int r;



	if (!p->evictable)
@@ -437,7 +439,7 @@ static bool amdgpu_cs_try_evict(struct amdgpu_cs_parser *p, 
			bo->tbo.mem.mem_type == TTM_PL_VRAM &&

			bo->tbo.mem.start < adev->mc.visible_vram_size >> PAGE_SHIFT;

		initial_bytes_moved = atomic64_read(&adev->num_bytes_moved);

		r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false);

		r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

		bytes_moved = atomic64_read(&adev->num_bytes_moved) -

			initial_bytes_moved;

		p->bytes_moved += bytes_moved;
@@ -476,6 +478,7 @@ static int amdgpu_cs_validate(void *param, struct amdgpu_bo *bo) 
static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,

			    struct list_head *validated)

{

	struct ttm_operation_ctx ctx = { true, false };

	struct amdgpu_bo_list_entry *lobj;

	int r;
@@ -493,8 +496,7 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, 
		    lobj->user_pages) {

			amdgpu_ttm_placement_from_domain(bo,

							 AMDGPU_GEM_DOMAIN_CPU);

			r = ttm_bo_validate(&bo->tbo, &bo->placement, true,

					    false);

			r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

			if (r)

				return r;

			amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
@@ -1575,6 +1577,7 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser, 
			   struct amdgpu_bo_va_mapping **map)

{

	struct amdgpu_fpriv *fpriv = parser->filp->driver_priv;

	struct ttm_operation_ctx ctx = { false, false };

	struct amdgpu_vm *vm = &fpriv->vm;

	struct amdgpu_bo_va_mapping *mapping;

	int r;
@@ -1595,8 +1598,7 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser, 
	if (!((*bo)->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)) {

		(*bo)->flags |= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;

		amdgpu_ttm_placement_from_domain(*bo, (*bo)->allowed_domains);

		r = ttm_bo_validate(&(*bo)->tbo, &(*bo)->placement, false,

				    false);

		r = ttm_bo_validate(&(*bo)->tbo, &(*bo)->placement, &ctx);

		if (r)

			return r;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,

			     struct drm_file *filp)

{

	struct ttm_operation_ctx ctx = { true, false };

	struct amdgpu_device *adev = dev->dev_private;

	struct drm_amdgpu_gem_userptr *args = data;

	struct drm_gem_object *gobj;
@@ -335,7 +336,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, 
			goto free_pages;



		amdgpu_ttm_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);

		r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false);

		r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

		amdgpu_bo_unreserve(bo);

		if (r)

			goto free_pages;

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

+8 −4
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ int amdgpu_bo_backup_to_shadow(struct amdgpu_device *adev, 


int amdgpu_bo_validate(struct amdgpu_bo *bo)

{

	struct ttm_operation_ctx ctx = { false, false };

	uint32_t domain;

	int r;
@@ -562,7 +563,7 @@ int amdgpu_bo_validate(struct amdgpu_bo *bo) 


retry:

	amdgpu_ttm_placement_from_domain(bo, domain);

	r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);

	r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

	if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) {

		domain = bo->allowed_domains;

		goto retry;
@@ -673,6 +674,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
			     u64 *gpu_addr)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	struct ttm_operation_ctx ctx = { false, false };

	int r, i;



	if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm))
@@ -723,7 +725,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
		bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;

	}



	r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);

	r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

	if (unlikely(r)) {

		dev_err(adev->dev, "%p pin failed\n", bo);

		goto error;
@@ -760,6 +762,7 @@ int amdgpu_bo_pin(struct amdgpu_bo *bo, u32 domain, u64 *gpu_addr) 
int amdgpu_bo_unpin(struct amdgpu_bo *bo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	struct ttm_operation_ctx ctx = { false, false };

	int r, i;



	if (!bo->pin_count) {
@@ -773,7 +776,7 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo) 
		bo->placements[i].lpfn = 0;

		bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;

	}

	r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);

	r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

	if (unlikely(r)) {

		dev_err(adev->dev, "%p validate failed for unpin\n", bo);

		goto error;
@@ -945,6 +948,7 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, 
int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

	struct ttm_operation_ctx ctx = { false, false };

	struct amdgpu_bo *abo;

	unsigned long offset, size;

	int r;
@@ -978,7 +982,7 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) 
	abo->placement.num_busy_placement = 1;

	abo->placement.busy_placement = &abo->placements[1];



	r = ttm_bo_validate(bo, &abo->placement, false, false);

	r = ttm_bo_validate(bo, &abo->placement, &ctx);

	if (unlikely(r != 0))

		return r;

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

+4 −2
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ static u64 amdgpu_uvd_get_addr_from_ctx(struct amdgpu_uvd_cs_ctx *ctx) 
 */

static int amdgpu_uvd_cs_pass1(struct amdgpu_uvd_cs_ctx *ctx)

{

	struct ttm_operation_ctx tctx = { false, false };

	struct amdgpu_bo_va_mapping *mapping;

	struct amdgpu_bo *bo;

	uint32_t cmd;
@@ -430,7 +431,7 @@ static int amdgpu_uvd_cs_pass1(struct amdgpu_uvd_cs_ctx *ctx) 
		}

		amdgpu_uvd_force_into_uvd_segment(bo);



		r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);

		r = ttm_bo_validate(&bo->tbo, &bo->placement, &tctx);

	}



	return r;
@@ -949,6 +950,7 @@ int amdgpu_uvd_ring_parse_cs(struct amdgpu_cs_parser *parser, uint32_t ib_idx) 
static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo,

			       bool direct, struct dma_fence **fence)

{

	struct ttm_operation_ctx ctx = { true, false };

	struct ttm_validate_buffer tv;

	struct ww_acquire_ctx ticket;

	struct list_head head;
@@ -975,7 +977,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, 
		amdgpu_uvd_force_into_uvd_segment(bo);

	}



	r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false);

	r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

	if (r)

		goto err;

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

+2 −1
Original line number Diff line number Diff line
@@ -558,6 +558,7 @@ static int amdgpu_vce_validate_bo(struct amdgpu_cs_parser *p, uint32_t ib_idx, 
				  int lo, int hi, unsigned size, int32_t index)

{

	int64_t offset = ((uint64_t)size) * ((int64_t)index);

	struct ttm_operation_ctx ctx = { false, false };

	struct amdgpu_bo_va_mapping *mapping;

	unsigned i, fpfn, lpfn;

	struct amdgpu_bo *bo;
@@ -587,7 +588,7 @@ static int amdgpu_vce_validate_bo(struct amdgpu_cs_parser *p, uint32_t ib_idx, 
		bo->placements[i].lpfn = bo->placements[i].fpfn ?

			min(bo->placements[i].fpfn, lpfn) : lpfn;

	}

	return ttm_bo_validate(&bo->tbo, &bo->placement, false, false);

	return ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

}