diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-03-02 20:52:21 -0500 |
|---|---|---|
| committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:52:04 -0500 |
| commit | e1339b8589017221f921e7ed95b1445ac289a4a9 (patch) | |
| tree | f6a332f3a879137f636d0ac18df516b3c8bc4765 /drivers | |
| parent | 208e2c33534eebf48239df04b0a25d3f82e681d0 (diff) | |
gpu: nvgpu: gp10b: Use mem_desc for buffers
Change-Id: Ia986125bf1a6e06121291f6dde24e580f0a1b61f
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/712836
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index db5d4ede..59f7deef 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
| @@ -56,7 +56,7 @@ static int channel_gp10b_commit_userd(struct channel_gk20a *c) | |||
| 56 | 56 | ||
| 57 | gk20a_dbg_fn(""); | 57 | gk20a_dbg_fn(""); |
| 58 | 58 | ||
| 59 | inst_ptr = c->inst_block.cpuva; | 59 | inst_ptr = c->inst_block.cpu_va; |
| 60 | if (!inst_ptr) | 60 | if (!inst_ptr) |
| 61 | return -ENOMEM; | 61 | return -ENOMEM; |
| 62 | 62 | ||
| @@ -84,7 +84,7 @@ static int channel_gp10b_setup_ramfc(struct channel_gk20a *c, | |||
| 84 | 84 | ||
| 85 | gk20a_dbg_fn(""); | 85 | gk20a_dbg_fn(""); |
| 86 | 86 | ||
| 87 | inst_ptr = c->inst_block.cpuva; | 87 | inst_ptr = c->inst_block.cpu_va; |
| 88 | if (!inst_ptr) | 88 | if (!inst_ptr) |
| 89 | return -ENOMEM; | 89 | return -ENOMEM; |
| 90 | 90 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index 6b140c92..9fde6147 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
| @@ -29,8 +29,8 @@ u32 gp10b_mm_get_physical_addr_bits(struct gk20a *g) | |||
| 29 | static int gp10b_init_mm_setup_hw(struct gk20a *g) | 29 | static int gp10b_init_mm_setup_hw(struct gk20a *g) |
| 30 | { | 30 | { |
| 31 | struct mm_gk20a *mm = &g->mm; | 31 | struct mm_gk20a *mm = &g->mm; |
| 32 | struct inst_desc *inst_block = &mm->bar1.inst_block; | 32 | struct mem_desc *inst_block = &mm->bar1.inst_block; |
| 33 | phys_addr_t inst_pa = inst_block->cpu_pa; | 33 | phys_addr_t inst_pa = gk20a_mem_phys(inst_block); |
| 34 | int err = 0; | 34 | int err = 0; |
| 35 | 35 | ||
| 36 | gk20a_dbg_fn(""); | 36 | gk20a_dbg_fn(""); |
| @@ -66,7 +66,7 @@ static int gb10b_init_bar2_vm(struct gk20a *g) | |||
| 66 | int err; | 66 | int err; |
| 67 | struct mm_gk20a *mm = &g->mm; | 67 | struct mm_gk20a *mm = &g->mm; |
| 68 | struct vm_gk20a *vm = &mm->bar2.vm; | 68 | struct vm_gk20a *vm = &mm->bar2.vm; |
| 69 | struct inst_desc *inst_block = &mm->bar2.inst_block; | 69 | struct mem_desc *inst_block = &mm->bar2.inst_block; |
| 70 | u32 big_page_size = gk20a_get_platform(g->dev)->default_big_page_size; | 70 | u32 big_page_size = gk20a_get_platform(g->dev)->default_big_page_size; |
| 71 | 71 | ||
| 72 | /* BAR2 aperture size is 32MB */ | 72 | /* BAR2 aperture size is 32MB */ |
| @@ -93,8 +93,8 @@ clean_up_va: | |||
| 93 | static int gb10b_init_bar2_mm_hw_setup(struct gk20a *g) | 93 | static int gb10b_init_bar2_mm_hw_setup(struct gk20a *g) |
| 94 | { | 94 | { |
| 95 | struct mm_gk20a *mm = &g->mm; | 95 | struct mm_gk20a *mm = &g->mm; |
| 96 | struct inst_desc *inst_block = &mm->bar2.inst_block; | 96 | struct mem_desc *inst_block = &mm->bar2.inst_block; |
| 97 | phys_addr_t inst_pa = inst_block->cpu_pa; | 97 | phys_addr_t inst_pa = gk20a_mem_phys(inst_block); |
| 98 | 98 | ||
| 99 | gk20a_dbg_fn(""); | 99 | gk20a_dbg_fn(""); |
| 100 | 100 | ||