openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: drop the extra VM huge page flag v2 

Just add the flags to the addr field as well.

v2: add some more comments that the flag is for huge pages.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2017-08-03 20:30:50 +02:00 committed by Alex Deucher
parent ec5207c9f1
commit 4ab4016aaf
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,7 +331,6 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
entry->bo = pt; entry->bo = pt;
entry->addr = 0; entry->addr = 0;
entry->huge_page = false;
} }
if (level < adev->vm_manager.num_level) { if (level < adev->vm_manager.num_level) {
@ -1083,11 +1082,12 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev,
pt = amdgpu_bo_gpu_offset(bo); pt = amdgpu_bo_gpu_offset(bo);
pt = amdgpu_gart_get_vm_pde(adev, pt); pt = amdgpu_gart_get_vm_pde(adev, pt);
if (parent->entries[pt_idx].addr == pt || /* Don't update huge pages here */
parent->entries[pt_idx].huge_page) if ((parent->entries[pt_idx].addr & AMDGPU_PDE_PTE) ||
parent->entries[pt_idx].addr == (pt | AMDGPU_PTE_VALID))
continue; continue;
parent->entries[pt_idx].addr = pt; parent->entries[pt_idx].addr = pt | AMDGPU_PTE_VALID;
pde = pd_addr + pt_idx * 8; pde = pd_addr + pt_idx * 8;
if (((last_pde + 8 * count) != pde) || if (((last_pde + 8 * count) != pde) ||
@ -1284,15 +1284,14 @@ static void amdgpu_vm_handle_huge_pages(struct amdgpu_pte_update_params *p,
dst = amdgpu_gart_get_vm_pde(p->adev, dst); dst = amdgpu_gart_get_vm_pde(p->adev, dst);
flags = AMDGPU_PTE_VALID; flags = AMDGPU_PTE_VALID;
} else { } else {
/* Set the huge page flag to stop scanning at this PDE */
flags |= AMDGPU_PDE_PTE; flags |= AMDGPU_PDE_PTE;
} }
if (entry->addr == dst && if (entry->addr == (dst | flags))
entry->huge_page == !!(flags & AMDGPU_PDE_PTE))
return; return;
entry->addr = dst; entry->addr = (dst | flags);
entry->huge_page = !!(flags & AMDGPU_PDE_PTE);
if (use_cpu_update) { if (use_cpu_update) {
pd_addr = (unsigned long)amdgpu_bo_kptr(parent->bo); pd_addr = (unsigned long)amdgpu_bo_kptr(parent->bo);
@ -1351,7 +1350,8 @@ static int amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params,
amdgpu_vm_handle_huge_pages(params, entry, parent, amdgpu_vm_handle_huge_pages(params, entry, parent,
nptes, dst, flags); nptes, dst, flags);
if (entry->huge_page) /* We don't need to update PTEs for huge pages */
if (entry->addr & AMDGPU_PDE_PTE)
continue; continue;
pt = entry->bo; pt = entry->bo;

1
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
View File

@ -103,7 +103,6 @@ struct amdgpu_bo_list_entry;
struct amdgpu_vm_pt { struct amdgpu_vm_pt {
struct amdgpu_bo *bo; struct amdgpu_bo *bo;
uint64_t addr; uint64_t addr;
bool huge_page;
/* array of page tables, one for each directory entry */ /* array of page tables, one for each directory entry */
struct amdgpu_vm_pt *entries; struct amdgpu_vm_pt *entries;