nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-25 02:52:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gpu: nvgpu: gp10b: Phys addresses for page tables"

Browse Source 
This reverts commit f7bf99929cf2ec5a295ac21c74cf9c4f1afd78c5.

Change-Id: I0acfa18e9cf9bedd4051ec00faa497b3cdb9454b
Signed-off-by: Matt Craighead <mcraighead@nvidia.com>
Reviewed-on: http://git-master/r/768599
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>
Tested-by: Hiroshi Doyu <hdoyu@nvidia.com>
This commit is contained in:
Matt Craighead
2015-07-09 14:24:31 -05:00
committed by Deepak Nibade
parent c965e66558
commit b0667dcd8a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/nvgpu/gp10b/mm_gp10b.c
View File

@@ -160,12 +160,13 @@ static int update_gmmu_pde3_locked(struct vm_gk20a *vm,
struct gk20a_mm_entry *pte = parent->entries + i;
u32 pde_v[2] = {0, 0};
u32 *pde;
struct gk20a *g = vm->mm->g;
gk20a_dbg_fn("");
pte_addr = virt_to_phys(pte->cpu_va)
pte_addr = g->ops.mm.get_iova_addr(g, pte->sgt->sgl, 0)
>> gmmu_new_pde_address_shift_v();
pde_addr = virt_to_phys(parent->cpu_va);
pde_addr = g->ops.mm.get_iova_addr(g, parent->sgt->sgl, 0);
pde_v[0] |= gmmu_new_pde_aperture_video_memory_f();
pde_v[0] |= gmmu_new_pde_address_sys_f(u64_lo32(pte_addr));
@@ -202,6 +203,7 @@ static int update_gmmu_pde0_locked(struct vm_gk20a *vm,
struct gk20a_mm_entry *entry = pte->entries + i;
u32 pde_v[4] = {0, 0, 0, 0};
u32 *pde;
struct gk20a *g = vm->mm->g;
gk20a_dbg_fn("");
@@ -209,11 +211,11 @@ static int update_gmmu_pde0_locked(struct vm_gk20a *vm,
big_valid = entry->size && entry->pgsz == gmmu_page_size_big;
if (small_valid)
pte_addr_small = virt_to_phys(entry->cpu_va)
pte_addr_small = g->ops.mm.get_iova_addr(g, entry->sgt->sgl, 0)
>> gmmu_new_dual_pde_address_shift_v();
if (big_valid)
pte_addr_big = virt_to_phys(entry->cpu_va)
pte_addr_big = g->ops.mm.get_iova_addr(g, entry->sgt->sgl, 0)
>> gmmu_new_dual_pde_address_big_shift_v();
if (small_valid) {