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

Commit 3c0eea6c authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: put VM page tables directly into duplicates list 



They share the reservation object with the page directory anyway.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
parent 5b011235

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

+2 −1
Original line number Diff line number Diff line
@@ -982,7 +982,8 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm); 
void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm);

struct amdgpu_bo_list_entry *amdgpu_vm_get_bos(struct amdgpu_device *adev,

					       struct amdgpu_vm *vm,

					       struct list_head *head);

					       struct list_head *validated,

					       struct list_head *duplicates);

int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,

		      struct amdgpu_sync *sync);

void amdgpu_vm_flush(struct amdgpu_ring *ring,

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

+2 −2
Original line number Diff line number Diff line
@@ -386,13 +386,13 @@ static int amdgpu_cs_parser_relocs(struct amdgpu_cs_parser *p) 
		amdgpu_cs_buckets_get_list(&buckets, &p->validated);

	}



	INIT_LIST_HEAD(&duplicates);

	p->vm_bos = amdgpu_vm_get_bos(p->adev, &fpriv->vm,

				      &p->validated);

				      &p->validated, &duplicates);



	if (need_mmap_lock)

		down_read(&current->mm->mmap_sem);



	INIT_LIST_HEAD(&duplicates);

	r = ttm_eu_reserve_buffers(&p->ticket, &p->validated, true, &duplicates);

	if (unlikely(r != 0))

		goto error_reserve;

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

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, 
	tv.shared = true;

	list_add(&tv.head, &list);



	vm_bos = amdgpu_vm_get_bos(adev, bo_va->vm, &list);

	vm_bos = amdgpu_vm_get_bos(adev, bo_va->vm, &list, &duplicates);

	if (!vm_bos)

		return;

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

+7 −5
Original line number Diff line number Diff line
@@ -78,14 +78,16 @@ static unsigned amdgpu_vm_directory_size(struct amdgpu_device *adev) 
 * amdgpu_vm_get_bos - add the vm BOs to a validation list

 *

 * @vm: vm providing the BOs

 * @head: head of validation list

 * @validated: head of validation list

 * @duplicates: head of duplicates list

 *

 * Add the page directory to the list of BOs to

 * validate for command submission (cayman+).

 */

struct amdgpu_bo_list_entry *amdgpu_vm_get_bos(struct amdgpu_device *adev,

					       struct amdgpu_vm *vm,

					  struct list_head *head)

					       struct list_head *validated,

					       struct list_head *duplicates)

{

	struct amdgpu_bo_list_entry *list;

	unsigned i, idx;
@@ -103,7 +105,7 @@ struct amdgpu_bo_list_entry *amdgpu_vm_get_bos(struct amdgpu_device *adev, 
	list[0].priority = 0;

	list[0].tv.bo = &vm->page_directory->tbo;

	list[0].tv.shared = true;

	list_add(&list[0].tv.head, head);

	list_add(&list[0].tv.head, validated);



	for (i = 0, idx = 1; i <= vm->max_pde_used; i++) {

		if (!vm->page_tables[i].bo)
@@ -115,7 +117,7 @@ struct amdgpu_bo_list_entry *amdgpu_vm_get_bos(struct amdgpu_device *adev, 
		list[idx].priority = 0;

		list[idx].tv.bo = &list[idx].robj->tbo;

		list[idx].tv.shared = true;

		list_add(&list[idx++].tv.head, head);

		list_add(&list[idx++].tv.head, duplicates);

	}



	return list;