gpu: nvgpu: gp10b: Use sysmem aperture for SoC memory

In Tegra GPU, SoC memory has to be accessed as vidmem. In discrete GPU, it
has to be accessed as sysmem.

Change-Id: Id26588df17b4921533804f72bc8c0ac3892ae154
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1122591
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
index ade6ff0a..9cb26d3f 100644
--- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
@@ -53,6 +53,7 @@ static int channel_gp10b_commit_userd(struct channel_gk20a *c)
         u32 addr_lo;
         u32 addr_hi;
         void *inst_ptr;
+        struct gk20a *g = c->g;
 
         gk20a_dbg_fn("");
 
@@ -67,12 +68,13 @@ static int channel_gp10b_commit_userd(struct channel_gk20a *c)
                 c->hw_chid, (u64)c->userd_iova);
 
         gk20a_mem_wr32(inst_ptr, ram_in_ramfc_w() + ram_fc_userd_w(),
-                 pbdma_userd_target_vid_mem_f() |
-                 pbdma_userd_addr_f(addr_lo));
+                       (g->mm.vidmem_is_vidmem ?
+                        pbdma_userd_target_sys_mem_ncoh_f() :
+                        pbdma_userd_target_vid_mem_f()) |
+                       pbdma_userd_addr_f(addr_lo));
 
         gk20a_mem_wr32(inst_ptr, ram_in_ramfc_w() + ram_fc_userd_hi_w(),
-                 pbdma_userd_target_vid_mem_f() |
-                 pbdma_userd_hi_addr_f(addr_hi));
+                       pbdma_userd_hi_addr_f(addr_hi));
 
         return 0;
 }