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

Commit 99e124f4 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup amdgpu_vm_bo_update params 



Make it more obvious what we are doing here.

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

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ int amdgpu_vm_clear_invalids(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
			     struct amdgpu_sync *sync);

int amdgpu_vm_bo_update(struct amdgpu_device *adev,

			struct amdgpu_bo_va *bo_va,

			struct ttm_mem_reg *mem);

			bool clear);

void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev,

			     struct amdgpu_bo *bo);

struct amdgpu_bo_va *amdgpu_vm_bo_find(struct amdgpu_vm *vm,

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

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p, 
			if (bo_va == NULL)

				continue;



			r = amdgpu_vm_bo_update(adev, bo_va, &bo->tbo.mem);

			r = amdgpu_vm_bo_update(adev, bo_va, false);

			if (r)

				return r;

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

+11 −10
Original line number Diff line number Diff line
@@ -1117,28 +1117,32 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, 
 *

 * @adev: amdgpu_device pointer

 * @bo_va: requested BO and VM object

 * @mem: ttm mem

 * @clear: if true clear the entries

 *

 * Fill in the page table entries for @bo_va.

 * Returns 0 for success, -EINVAL for failure.

 *

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

 */

int amdgpu_vm_bo_update(struct amdgpu_device *adev,

			struct amdgpu_bo_va *bo_va,

			struct ttm_mem_reg *mem)

			bool clear)

{

	struct amdgpu_vm *vm = bo_va->vm;

	struct amdgpu_bo_va_mapping *mapping;

	dma_addr_t *pages_addr = NULL;

	uint32_t gtt_flags, flags;

	struct ttm_mem_reg *mem;

	struct fence *exclusive;

	uint64_t addr;

	int r;



	if (mem) {

	if (clear) {

		mem = NULL;

		addr = 0;

		exclusive = NULL;

	} else {

		struct ttm_dma_tt *ttm;



		mem = &bo_va->bo->tbo.mem;

		addr = (u64)mem->start << PAGE_SHIFT;

		switch (mem->mem_type) {

		case TTM_PL_TT:
@@ -1156,9 +1160,6 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, 
		}



		exclusive = reservation_object_get_excl(bo_va->bo->tbo.resv);

	} else {

		addr = 0;

		exclusive = NULL;

	}



	flags = amdgpu_ttm_tt_pte_flags(adev, bo_va->bo->tbo.ttm, mem);
@@ -1189,7 +1190,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, 
	spin_lock(&vm->status_lock);

	list_splice_init(&bo_va->invalids, &bo_va->valids);

	list_del_init(&bo_va->vm_status);

	if (!mem)

	if (clear)

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

	spin_unlock(&vm->status_lock);
@@ -1252,7 +1253,7 @@ int amdgpu_vm_clear_invalids(struct amdgpu_device *adev, 
			struct amdgpu_bo_va, vm_status);

		spin_unlock(&vm->status_lock);



		r = amdgpu_vm_bo_update(adev, bo_va, NULL);

		r = amdgpu_vm_bo_update(adev, bo_va, true);

		if (r)

			return r;