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

Commit 5a712a87 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: validate VM PTs only on eviction 



We don't need to validate them again if the eviction counter didn't changed.

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

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

+3 −1
Original line number Diff line number Diff line
@@ -864,6 +864,7 @@ struct amdgpu_vm { 
	struct amdgpu_bo	*page_directory;

	unsigned		max_pde_used;

	struct fence		*page_directory_fence;

	uint64_t		last_eviction_counter;



	/* array of page tables, one for each page directory entry */

	struct amdgpu_vm_pt	*page_tables;
@@ -932,7 +933,8 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm); 
void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm,

			 struct list_head *validated,

			 struct amdgpu_bo_list_entry *entry);

void amdgpu_vm_get_pt_bos(struct amdgpu_vm *vm, struct list_head *duplicates);

void amdgpu_vm_get_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,

			  struct list_head *duplicates);

void amdgpu_vm_move_pt_bos_in_lru(struct amdgpu_device *adev,

				  struct amdgpu_vm *vm);

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

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

+4 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
		list_splice(&need_pages, &p->validated);

	}



	amdgpu_vm_get_pt_bos(&fpriv->vm, &duplicates);

	amdgpu_vm_get_pt_bos(p->adev, &fpriv->vm, &duplicates);



	p->bytes_moved_threshold = amdgpu_cs_get_threshold_for_moves(p->adev);

	p->bytes_moved = 0;
@@ -472,6 +472,9 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
	if (r)

		goto error_validate;



	fpriv->vm.last_eviction_counter =

		atomic64_read(&p->adev->num_evictions);



	if (p->bo_list) {

		struct amdgpu_bo *gds = p->bo_list->gds_obj;

		struct amdgpu_bo *gws = p->bo_list->gws_obj;

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

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, 
	if (r)

		goto error_print;



	amdgpu_vm_get_pt_bos(bo_va->vm, &duplicates);

	amdgpu_vm_get_pt_bos(adev, bo_va->vm, &duplicates);

	list_for_each_entry(entry, &list, head) {

		domain = amdgpu_mem_type_to_domain(entry->bo->mem.mem_type);

		/* if anything is swapped out don't swap it in here,

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

+12 −1
Original line number Diff line number Diff line
@@ -115,16 +115,26 @@ void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm, 
/**

 * amdgpu_vm_get_bos - add the vm BOs to a duplicates list

 *

 * @adev: amdgpu device pointer

 * @vm: vm providing the BOs

 * @duplicates: head of duplicates list

 *

 * Add the page directory to the BO duplicates list

 * for command submission.

 */

void amdgpu_vm_get_pt_bos(struct amdgpu_vm *vm, struct list_head *duplicates)

void amdgpu_vm_get_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,

			  struct list_head *duplicates)

{

	uint64_t num_evictions;

	unsigned i;



	/* We only need to validate the page tables

	 * if they aren't already valid.

	 */

	num_evictions = atomic64_read(&adev->num_evictions);

	if (num_evictions == vm->last_eviction_counter)

		return;



	/* add the vm page table to the list */

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

		struct amdgpu_bo_list_entry *entry = &vm->page_tables[i].entry;
@@ -1534,6 +1544,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm) 
	amdgpu_bo_unreserve(vm->page_directory);

	if (r)

		goto error_free_page_directory;

	vm->last_eviction_counter = atomic64_read(&adev->num_evictions);



	return 0;