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

Commit 4c7e8855 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: update pt shadow while updating pt V2 



V2:
move shadow parameter to amdgpu_pte_update_params.

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Cc: minutemaidpark@hotmail.com
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6557e3d2

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

+15 −1
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ struct amdgpu_pte_update_params { 
	void (*func)(struct amdgpu_pte_update_params *params, uint64_t pe,

		     uint64_t addr, unsigned count, uint32_t incr,

		     uint32_t flags);

	/* indicate update pt or its shadow */

	bool shadow;

};



/**
@@ -761,7 +763,11 @@ static void amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params, 
	addr = start;

	pt_idx = addr >> amdgpu_vm_block_size;

	pt = vm->page_tables[pt_idx].entry.robj;



	if (params->shadow) {

		if (!pt->shadow)

			return;

		pt = vm->page_tables[pt_idx].entry.robj->shadow;

	}

	if ((addr & ~mask) == (end & ~mask))

		nptes = end - addr;

	else
@@ -780,6 +786,11 @@ static void amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params, 
	while (addr < end) {

		pt_idx = addr >> amdgpu_vm_block_size;

		pt = vm->page_tables[pt_idx].entry.robj;

		if (params->shadow) {

			if (!pt->shadow)

				return;

			pt = vm->page_tables[pt_idx].entry.robj->shadow;

		}



		if ((addr & ~mask) == (end & ~mask))

			nptes = end - addr;
@@ -1004,6 +1015,9 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, 
	if (r)

		goto error_free;



	params.shadow = true;

	amdgpu_vm_frag_ptes(&params, vm, start, last + 1, addr, flags);

	params.shadow = false;

	amdgpu_vm_frag_ptes(&params, vm, start, last + 1, addr, flags);



	amdgpu_ring_pad_ib(ring, params.ib);