diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-04-06 18:30:01 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-20 19:14:32 -0400 |
commit | e32f62fadfcde413bcd9b5af61ad884e27ba2bf1 (patch) | |
tree | eff606a0826841eae6ade5906acd9da589d1179a /drivers/gpu/nvgpu/gp10b | |
parent | 52bd58b560d0b3b49c03ef5c2637b67adeac8193 (diff) |
gpu: nvgpu: Move Linux nvgpu_mem fields
Hide the Linux specific nvgpu_mem fields so that in subsequent patches
core code can instead of using struct sg_table it can use mem_desc.
Routines for accessing system specific fields will be added as needed.
This is the first step in a fairly major overhaul of the GMMU mapping
routines. There are numerous issues with the current design (or lack
there of): massively coupled code, system dependencies, disorganization,
etc.
JIRA NVGPU-12
JIRA NVGPU-30
Change-Id: I2e7d3ae3a07468cfc17c1c642d28ed1b0952474d
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1464076
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 24e7ffad..7ae6abc2 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -842,7 +842,7 @@ int gr_gp10b_alloc_buffer(struct vm_gk20a *vm, size_t size, | |||
842 | return err; | 842 | return err; |
843 | 843 | ||
844 | mem->gpu_va = gk20a_gmmu_map(vm, | 844 | mem->gpu_va = gk20a_gmmu_map(vm, |
845 | &mem->sgt, | 845 | &mem->priv.sgt, |
846 | size, | 846 | size, |
847 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, | 847 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, |
848 | gk20a_mem_flag_none, | 848 | gk20a_mem_flag_none, |
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index c2e0fddf..c5149f22 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -41,7 +41,7 @@ static int gp10b_init_mm_setup_hw(struct gk20a *g) | |||
41 | g->ops.fb.set_mmu_page_size(g); | 41 | g->ops.fb.set_mmu_page_size(g); |
42 | 42 | ||
43 | gk20a_writel(g, fb_niso_flush_sysmem_addr_r(), | 43 | gk20a_writel(g, fb_niso_flush_sysmem_addr_r(), |
44 | (g->ops.mm.get_iova_addr(g, g->mm.sysmem_flush.sgt->sgl, 0) | 44 | (g->ops.mm.get_iova_addr(g, g->mm.sysmem_flush.priv.sgt->sgl, 0) |
45 | >> 8ULL)); | 45 | >> 8ULL)); |
46 | 46 | ||
47 | g->ops.bus.bar1_bind(g, inst_block); | 47 | g->ops.bus.bar1_bind(g, inst_block); |