summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-04-06 18:30:01 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-20 19:14:32 -0400
commite32f62fadfcde413bcd9b5af61ad884e27ba2bf1 (patch)
treeeff606a0826841eae6ade5906acd9da589d1179a /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
parent52bd58b560d0b3b49c03ef5c2637b67adeac8193 (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/gk20a/fifo_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 12bb3688..314d4551 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -954,7 +954,7 @@ static int gk20a_init_fifo_setup_sw(struct gk20a *g)
954 954
955 for (chid = 0; chid < f->num_channels; chid++) { 955 for (chid = 0; chid < f->num_channels; chid++) {
956 f->channel[chid].userd_iova = 956 f->channel[chid].userd_iova =
957 g->ops.mm.get_iova_addr(g, f->userd.sgt->sgl, 0) 957 g->ops.mm.get_iova_addr(g, f->userd.priv.sgt->sgl, 0)
958 + chid * f->userd_entry_size; 958 + chid * f->userd_entry_size;
959 f->channel[chid].userd_gpu_va = 959 f->channel[chid].userd_gpu_va =
960 f->userd.gpu_va + chid * f->userd_entry_size; 960 f->userd.gpu_va + chid * f->userd_entry_size;
@@ -3148,7 +3148,7 @@ static int gk20a_fifo_update_runlist_locked(struct gk20a *g, u32 runlist_id,
3148 new_buf = !runlist->cur_buffer; 3148 new_buf = !runlist->cur_buffer;
3149 3149
3150 runlist_iova = g->ops.mm.get_iova_addr( 3150 runlist_iova = g->ops.mm.get_iova_addr(
3151 g, runlist->mem[new_buf].sgt->sgl, 0); 3151 g, runlist->mem[new_buf].priv.sgt->sgl, 0);
3152 3152
3153 gk20a_dbg_info("runlist_id : %d, switch to new buffer 0x%16llx", 3153 gk20a_dbg_info("runlist_id : %d, switch to new buffer 0x%16llx",
3154 runlist_id, (u64)runlist_iova); 3154 runlist_id, (u64)runlist_iova);