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

Commit 036bf46a authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: fix handling of radeon_vm_bo_rmv v3 

v3: completely rewritten. We now just remember which areas
    of the PT to clear and do so on the next command submission.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=79980



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 20b2656d

drivers/gpu/drm/radeon/radeon.h

+9 −4
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ struct radeon_bo_va { 


	/* protected by vm mutex */

	struct list_head		vm_list;

	struct list_head		vm_status;



	/* constant after initialization */

	struct radeon_vm		*vm;
@@ -867,6 +868,9 @@ struct radeon_vm { 
	struct list_head		va;

	unsigned			id;



	/* BOs freed, but not yet updated in the PT */

	struct list_head		freed;



	/* contains the page directory */

	struct radeon_bo		*page_directory;

	uint64_t			pd_gpu_addr;
@@ -2832,9 +2836,10 @@ void radeon_vm_fence(struct radeon_device *rdev, 
uint64_t radeon_vm_map_gart(struct radeon_device *rdev, uint64_t addr);

int radeon_vm_update_page_directory(struct radeon_device *rdev,

				    struct radeon_vm *vm);

int radeon_vm_clear_freed(struct radeon_device *rdev,

			  struct radeon_vm *vm);

int radeon_vm_bo_update(struct radeon_device *rdev,

			struct radeon_vm *vm,

			struct radeon_bo *bo,

			struct radeon_bo_va *bo_va,

			struct ttm_mem_reg *mem);

void radeon_vm_bo_invalidate(struct radeon_device *rdev,

			     struct radeon_bo *bo);
@@ -2847,7 +2852,7 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, 
			  struct radeon_bo_va *bo_va,

			  uint64_t offset,

			  uint32_t flags);

int radeon_vm_bo_rmv(struct radeon_device *rdev,

void radeon_vm_bo_rmv(struct radeon_device *rdev,

		      struct radeon_bo_va *bo_va);



/* audio */

drivers/gpu/drm/radeon/radeon_cs.c

+19 −3
Original line number Diff line number Diff line
@@ -461,14 +461,24 @@ static int radeon_bo_vm_update_pte(struct radeon_cs_parser *p, 
				   struct radeon_vm *vm)

{

	struct radeon_device *rdev = p->rdev;

	struct radeon_bo_va *bo_va;

	int i, r;



	r = radeon_vm_update_page_directory(rdev, vm);

	if (r)

		return r;



	r = radeon_vm_bo_update(rdev, vm, rdev->ring_tmp_bo.bo,

				&rdev->ring_tmp_bo.bo->tbo.mem);

	r = radeon_vm_clear_freed(rdev, vm);

	if (r)

		return r;



	bo_va = radeon_vm_bo_find(vm, rdev->ring_tmp_bo.bo);

	if (bo_va == NULL) {

		DRM_ERROR("Tmp BO not in VM!\n");

		return -EINVAL;

	}



	r = radeon_vm_bo_update(rdev, bo_va, &rdev->ring_tmp_bo.bo->tbo.mem);

	if (r)

		return r;
@@ -480,7 +490,13 @@ static int radeon_bo_vm_update_pte(struct radeon_cs_parser *p, 
			continue;



		bo = p->relocs[i].robj;

		r = radeon_vm_bo_update(rdev, vm, bo, &bo->tbo.mem);

		bo_va = radeon_vm_bo_find(vm, bo);

		if (bo_va == NULL) {

			dev_err(rdev->dev, "bo %p not in vm %p\n", bo, vm);

			return -EINVAL;

		}



		r = radeon_vm_bo_update(rdev, bo_va, &bo->tbo.mem);

		if (r)

			return r;

	}

drivers/gpu/drm/radeon/radeon_vm.c

+58 −24
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ struct radeon_bo_va *radeon_vm_bo_add(struct radeon_device *rdev, 
	bo_va->ref_count = 1;

	INIT_LIST_HEAD(&bo_va->bo_list);

	INIT_LIST_HEAD(&bo_va->vm_list);

	INIT_LIST_HEAD(&bo_va->vm_status);



	mutex_lock(&vm->mutex);

	list_add(&bo_va->vm_list, &vm->va);
@@ -468,6 +469,15 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, 
		head = &tmp->vm_list;

	}



	if (bo_va->soffset) {

		/* add a clone of the bo_va to clear the old address */

		tmp = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL);

		tmp->soffset = bo_va->soffset;

		tmp->eoffset = bo_va->eoffset;

		tmp->vm = vm;

		list_add(&tmp->vm_status, &vm->freed);

	}



	bo_va->soffset = soffset;

	bo_va->eoffset = eoffset;

	bo_va->flags = flags;
@@ -823,25 +833,19 @@ static void radeon_vm_update_ptes(struct radeon_device *rdev, 
 * Object have to be reserved and mutex must be locked!

 */

int radeon_vm_bo_update(struct radeon_device *rdev,

			struct radeon_vm *vm,

			struct radeon_bo *bo,

			struct radeon_bo_va *bo_va,

			struct ttm_mem_reg *mem)

{

	struct radeon_vm *vm = bo_va->vm;

	struct radeon_ib ib;

	struct radeon_bo_va *bo_va;

	unsigned nptes, ndw;

	uint64_t addr;

	int r;



	bo_va = radeon_vm_bo_find(vm, bo);

	if (bo_va == NULL) {

		dev_err(rdev->dev, "bo %p not in vm %p\n", bo, vm);

		return -EINVAL;

	}



	if (!bo_va->soffset) {

		dev_err(rdev->dev, "bo %p don't has a mapping in vm %p\n",

			bo, vm);

			bo_va->bo, vm);

		return -EINVAL;

	}
@@ -868,7 +872,7 @@ int radeon_vm_bo_update(struct radeon_device *rdev, 


	trace_radeon_vm_bo_update(bo_va);



	nptes = radeon_bo_ngpu_pages(bo);

	nptes = (bo_va->eoffset - bo_va->soffset) / RADEON_GPU_PAGE_SIZE;



	/* padding, etc. */

	ndw = 64;
@@ -910,6 +914,34 @@ int radeon_vm_bo_update(struct radeon_device *rdev, 
	return 0;

}



/**

 * radeon_vm_clear_freed - clear freed BOs in the PT

 *

 * @rdev: radeon_device pointer

 * @vm: requested vm

 *

 * Make sure all freed BOs are cleared in the PT.

 * Returns 0 for success.

 *

 * PTs have to be reserved and mutex must be locked!

 */

int radeon_vm_clear_freed(struct radeon_device *rdev,

			  struct radeon_vm *vm)

{

	struct radeon_bo_va *bo_va, *tmp;

	int r;



	list_for_each_entry_safe(bo_va, tmp, &vm->freed, vm_status) {

		list_del(&bo_va->vm_status);

		r = radeon_vm_bo_update(rdev, bo_va, NULL);

		kfree(bo_va);

		if (r)

			return r;

	}

	return 0;



}



/**

 * radeon_vm_bo_rmv - remove a bo to a specific vm

 *
@@ -917,27 +949,27 @@ int radeon_vm_bo_update(struct radeon_device *rdev, 
 * @bo_va: requested bo_va

 *

 * Remove @bo_va->bo from the requested vm (cayman+).

 * Remove @bo_va->bo from the list of bos associated with the bo_va->vm and

 * remove the ptes for @bo_va in the page table.

 * Returns 0 for success.

 *

 * Object have to be reserved!

 */

int radeon_vm_bo_rmv(struct radeon_device *rdev,

void radeon_vm_bo_rmv(struct radeon_device *rdev,

		      struct radeon_bo_va *bo_va)

{

	int r = 0;

	struct radeon_vm *vm = bo_va->vm;



	mutex_lock(&bo_va->vm->mutex);

	if (bo_va->soffset)

		r = radeon_vm_bo_update(rdev, bo_va->vm, bo_va->bo, NULL);

	list_del(&bo_va->bo_list);



	mutex_lock(&vm->mutex);

	list_del(&bo_va->vm_list);

	mutex_unlock(&bo_va->vm->mutex);

	list_del(&bo_va->bo_list);



	if (bo_va->soffset) {

		bo_va->bo = NULL;

		list_add(&bo_va->vm_status, &vm->freed);

	} else {

		kfree(bo_va);

	return r;

	}



	mutex_unlock(&vm->mutex);

}



/**
@@ -980,6 +1012,7 @@ int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm) 
	vm->last_id_use = NULL;

	mutex_init(&vm->mutex);

	INIT_LIST_HEAD(&vm->va);

	INIT_LIST_HEAD(&vm->freed);



	pd_size = radeon_vm_directory_size(rdev);

	pd_entries = radeon_vm_num_pdes(rdev);
@@ -1034,7 +1067,8 @@ void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm) 
			kfree(bo_va);

		}

	}



	list_for_each_entry_safe(bo_va, tmp, &vm->freed, vm_status)

		kfree(bo_va);



	for (i = 0; i < radeon_vm_num_pdes(rdev); i++)

		radeon_bo_unref(&vm->page_tables[i].bo);