10 files changed, 114 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
index 188d1781..8586262f 100644
--- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
@@ -34,7 +34,9 @@ static void channel_gm20b_bind(struct channel_gk20a *c)
 
         gk20a_writel(g, ccsr_channel_inst_r(c->hw_chid),
                 ccsr_channel_inst_ptr_f(inst_ptr) |
-                ccsr_channel_inst_target_vid_mem_f() |
+                (g->mm.vidmem_is_vidmem ?
+                 ccsr_channel_inst_target_sys_mem_ncoh_f() :
+                 ccsr_channel_inst_target_vid_mem_f()) |
                 ccsr_channel_inst_bind_true_f());
 
         gk20a_writel(g, ccsr_channel_r(c->hw_chid),
diff --git a/drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h
index 004f8e1e..6e412e17 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -62,6 +62,14 @@ static inline u32 bus_bar1_block_target_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 bus_bar1_block_target_sys_mem_coh_f(void)
+{
+        return 0x20000000;
+}
+static inline u32 bus_bar1_block_target_sys_mem_ncoh_f(void)
+{
+        return 0x30000000;
+}
 static inline u32 bus_bar1_block_mode_virtual_f(void)
 {
         return 0x80000000;
@@ -78,6 +86,14 @@ static inline u32 bus_bar2_block_target_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 bus_bar2_block_target_sys_mem_coh_f(void)
+{
+        return 0x20000000;
+}
+static inline u32 bus_bar2_block_target_sys_mem_ncoh_f(void)
+{
+        return 0x30000000;
+}
 static inline u32 bus_bar2_block_mode_virtual_f(void)
 {
         return 0x80000000;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_ccsr_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_ccsr_gm20b.h
index 9dd03ee1..2fdf73ae 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_ccsr_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_ccsr_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -66,6 +66,14 @@ static inline u32 ccsr_channel_inst_target_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 ccsr_channel_inst_target_sys_mem_coh_f(void)
+{
+        return 0x20000000;
+}
+static inline u32 ccsr_channel_inst_target_sys_mem_ncoh_f(void)
+{
+        return 0x30000000;
+}
 static inline u32 ccsr_channel_inst_bind_false_f(void)
 {
         return 0x0;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h
index d68f6479..a6010696 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -114,6 +114,10 @@ static inline u32 fb_mmu_invalidate_pdb_aperture_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 fb_mmu_invalidate_pdb_aperture_sys_mem_f(void)
+{
+        return 0x2;
+}
 static inline u32 fb_mmu_invalidate_pdb_addr_f(u32 v)
 {
         return (v & 0xfffffff) << 4;
@@ -174,6 +178,14 @@ static inline u32 fb_mmu_debug_wr_aperture_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 fb_mmu_debug_wr_aperture_sys_mem_coh_f(void)
+{
+        return 0x2;
+}
+static inline u32 fb_mmu_debug_wr_aperture_sys_mem_ncoh_f(void)
+{
+        return 0x3;
+}
 static inline u32 fb_mmu_debug_wr_vol_false_f(void)
 {
         return 0x0;
@@ -202,6 +214,14 @@ static inline u32 fb_mmu_debug_rd_aperture_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 fb_mmu_debug_rd_aperture_sys_mem_coh_f(void)
+{
+        return 0x2;
+}
+static inline u32 fb_mmu_debug_rd_aperture_sys_mem_ncoh_f(void)
+{
+        return 0x3;
+}
 static inline u32 fb_mmu_debug_rd_vol_false_f(void)
 {
         return 0x0;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_fifo_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_fifo_gm20b.h
index eb9f1694..8aa1c6a4 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_fifo_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_fifo_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -82,6 +82,14 @@ static inline u32 fifo_runlist_base_target_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 fifo_runlist_base_target_sys_mem_coh_f(void)
+{
+        return 0x20000000;
+}
+static inline u32 fifo_runlist_base_target_sys_mem_ncoh_f(void)
+{
+        return 0x30000000;
+}
 static inline u32 fifo_runlist_r(void)
 {
         return 0x00002274;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h
index 572f727f..3b272948 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -62,6 +62,14 @@ static inline u32 gmmu_pde_aperture_big_video_memory_f(void)
 {
         return 0x1;
 }
+static inline u32 gmmu_pde_aperture_big_sys_mem_coh_f(void)
+{
+        return 0x2;
+}
+static inline u32 gmmu_pde_aperture_big_sys_mem_ncoh_f(void)
+{
+        return 0x3;
+}
 static inline u32 gmmu_pde_size_w(void)
 {
         return 0;
@@ -90,6 +98,14 @@ static inline u32 gmmu_pde_aperture_small_video_memory_f(void)
 {
         return 0x1;
 }
+static inline u32 gmmu_pde_aperture_small_sys_mem_coh_f(void)
+{
+        return 0x2;
+}
+static inline u32 gmmu_pde_aperture_small_sys_mem_ncoh_f(void)
+{
+        return 0x3;
+}
 static inline u32 gmmu_pde_vol_small_w(void)
 {
         return 1;
@@ -186,6 +202,14 @@ static inline u32 gmmu_pte_aperture_video_memory_f(void)
 {
         return 0x0;
 }
+static inline u32 gmmu_pte_aperture_sys_mem_coh_f(void)
+{
+        return 0x4;
+}
+static inline u32 gmmu_pte_aperture_sys_mem_ncoh_f(void)
+{
+        return 0x6;
+}
 static inline u32 gmmu_pte_read_only_w(void)
 {
         return 0;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
index 4930d4c7..dbe54860 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
@@ -838,6 +838,14 @@ static inline u32 gr_fecs_current_ctx_target_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 gr_fecs_current_ctx_target_sys_mem_coh_f(void)
+{
+        return 0x20000000;
+}
+static inline u32 gr_fecs_current_ctx_target_sys_mem_ncoh_f(void)
+{
+        return 0x30000000;
+}
 static inline u32 gr_fecs_current_ctx_valid_s(void)
 {
         return 1;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h
index 19b3bc44..cabf3ba4 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h
@@ -322,6 +322,14 @@ static inline u32 pbdma_userd_target_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 pbdma_userd_target_sys_mem_coh_f(void)
+{
+        return 0x2;
+}
+static inline u32 pbdma_userd_target_sys_mem_ncoh_f(void)
+{
+        return 0x3;
+}
 static inline u32 pbdma_userd_addr_f(u32 v)
 {
         return (v & 0x7fffff) << 9;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_pwr_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_pwr_gm20b.h
index 7f1814f0..b4dae452 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_pwr_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_pwr_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -538,6 +538,10 @@ static inline u32 pwr_pmu_new_instblk_target_sys_coh_f(void)
 {
         return 0x20000000;
 }
+static inline u32 pwr_pmu_new_instblk_target_sys_ncoh_f(void)
+{
+        return 0x30000000;
+}
 static inline u32 pwr_pmu_new_instblk_valid_f(u32 v)
 {
         return (v & 0x1) << 30;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_ram_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_ram_gm20b.h
index a05f1c2b..e7367003 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_ram_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_ram_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -70,6 +70,14 @@ static inline u32 ram_in_page_dir_base_target_vid_mem_f(void)
 {
         return 0x0;
 }
+static inline u32 ram_in_page_dir_base_target_sys_mem_coh_f(void)
+{
+        return 0x2;
+}
+static inline u32 ram_in_page_dir_base_target_sys_mem_ncoh_f(void)
+{
+        return 0x3;
+}
 static inline u32 ram_in_page_dir_base_vol_w(void)
 {
         return 128;