mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 03:40:04 +00:00
drm/amdgpu: update pt shadow while updating pt V2
V2: move shadow parameter to amdgpu_pte_update_params. Signed-off-by: Chunming Zhou <David1.Zhou@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Cc: minutemaidpark@hotmail.com Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
6557e3d294
commit
4c7e885506
1 changed files with 15 additions and 1 deletions
|
@ -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(¶ms, vm, start, last + 1, addr, flags);
|
||||
params.shadow = false;
|
||||
amdgpu_vm_frag_ptes(¶ms, vm, start, last + 1, addr, flags);
|
||||
|
||||
amdgpu_ring_pad_ib(ring, params.ib);
|
||||
|
|
Loading…
Reference in a new issue