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

Commit bb475839 authored by Junwei Zhang's avatar Junwei Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: simplify bo_va list when vm bo update (v2) 



v2: fix compiling warning

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

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

+10 −12
Original line number Diff line number Diff line
@@ -1509,6 +1509,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, 
	struct drm_mm_node *nodes;

	struct dma_fence *exclusive, **last_update;

	uint64_t flags;

	uint32_t mem_type;

	int r;



	if (clear || !bo_va->base.bo) {
@@ -1561,19 +1562,16 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, 
	}



	spin_lock(&vm->status_lock);

	if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv) {

		unsigned mem_type = bo->tbo.mem.mem_type;

	list_del_init(&bo_va->base.vm_status);



	/* If the BO is not in its preferred location add it back to

	 * the evicted list so that it gets validated again on the

	 * next command submission.

	 */

		list_del_init(&bo_va->base.vm_status);

		if (!(bo->preferred_domains & amdgpu_mem_type_to_domain(mem_type)))

	mem_type = bo->tbo.mem.mem_type;

	if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv &&

	    !(bo->preferred_domains & amdgpu_mem_type_to_domain(mem_type)))

		list_add_tail(&bo_va->base.vm_status, &vm->evicted);

	} else {

		list_del_init(&bo_va->base.vm_status);

	}

	spin_unlock(&vm->status_lock);



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