leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: add amdgpu_vm_update_func

Browse Source 
Add helper to call the update function for both BO and shadow.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2018-08-30 15:55:54 +02:00 committed by Alex Deucher
parent ba79fde47b
commit 1c860a022f
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
View File

@ -1113,6 +1113,22 @@ static int amdgpu_vm_wait_pd(struct amdgpu_device *adev, struct amdgpu_vm *vm,
return r; return r;
} }
/**
* amdgpu_vm_update_func - helper to call update function
*
* Calls the update function for both the given BO as well as its shadow.
*/
static void amdgpu_vm_update_func(struct amdgpu_pte_update_params *params,
struct amdgpu_bo *bo,
uint64_t pe, uint64_t addr,
unsigned count, uint32_t incr,
uint64_t flags)
{
if (bo->shadow)
params->func(params, bo->shadow, pe, addr, count, incr, flags);
params->func(params, bo, pe, addr, count, incr, flags);
}
/* /*
* amdgpu_vm_update_pde - update a single level in the hierarchy * amdgpu_vm_update_pde - update a single level in the hierarchy
* *
@ -1142,9 +1158,7 @@ static void amdgpu_vm_update_pde(struct amdgpu_pte_update_params *params,
level += params->adev->vm_manager.root_level; level += params->adev->vm_manager.root_level;
amdgpu_gmc_get_pde_for_bo(entry->base.bo, level, &pt, &flags); amdgpu_gmc_get_pde_for_bo(entry->base.bo, level, &pt, &flags);
pde = (entry - parent->entries) * 8; pde = (entry - parent->entries) * 8;
if (bo->shadow) amdgpu_vm_update_func(params, bo, pde, pt, 1, 0, flags);
params->func(params, bo->shadow, pde, pt, 1, 0, flags);
params->func(params, bo, pde, pt, 1, 0, flags);
} }
/* /*
@ -1351,9 +1365,7 @@ static void amdgpu_vm_handle_huge_pages(struct amdgpu_pte_update_params *p,
amdgpu_gmc_get_vm_pde(p->adev, AMDGPU_VM_PDB0, &dst, &flags); amdgpu_gmc_get_vm_pde(p->adev, AMDGPU_VM_PDB0, &dst, &flags);
pde = (entry - parent->entries) * 8; pde = (entry - parent->entries) * 8;
if (parent->base.bo->shadow) amdgpu_vm_update_func(p, parent->base.bo, pde, dst, 1, 0, flags);
p->func(p, parent->base.bo->shadow, pde, dst, 1, 0, flags);
p->func(p, parent->base.bo, pde, dst, 1, 0, flags);
} }
/** /**
@ -1403,11 +1415,9 @@ static int amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params,
pt = entry->base.bo; pt = entry->base.bo;
pe_start = (addr & mask) * 8; pe_start = (addr & mask) * 8;
if (pt->shadow) amdgpu_vm_update_func(params, pt, pe_start, dst, nptes,
params->func(params, pt->shadow, pe_start, dst, nptes, AMDGPU_GPU_PAGE_SIZE, flags);
AMDGPU_GPU_PAGE_SIZE, flags);
params->func(params, pt, pe_start, dst, nptes,
AMDGPU_GPU_PAGE_SIZE, flags);
} }
return 0; return 0;