Revert "Revert "Revert "gpu: nvgpu: Get coherency on gv100 + NVLINK working"""

This reverts commit 89fbf39a05483917c0a9f3453fd94c724bc37375.

Bug 2075315

Change-Id: Id34a0376be5160b164931926ec600f77edf69667
Signed-off-by: Timo Alho <talho@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1668487
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index 9e60d9f7..feed2002 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -101,14 +101,12 @@ void gv11b_get_ch_runlist_entry(struct channel_gk20a *c, u32 *runlist)
                                                 c->runqueue_sel) |
                         ram_rl_entry_chan_userd_target_f(
                                 nvgpu_aperture_mask(g, &g->fifo.userd,
-                                        ram_rl_entry_chan_userd_target_sys_mem_ncoh_v(),
-                                        ram_rl_entry_chan_userd_target_sys_mem_coh_v(),
-                                        ram_rl_entry_chan_userd_target_vid_mem_v())) |
+                                ram_rl_entry_chan_userd_target_sys_mem_ncoh_v(),
+                                ram_rl_entry_chan_userd_target_vid_mem_v())) |
                         ram_rl_entry_chan_inst_target_f(
                                 nvgpu_aperture_mask(g, &c->inst_block,
-                                        ram_rl_entry_chan_inst_target_sys_mem_ncoh_v(),
-                                        ram_rl_entry_chan_inst_target_sys_mem_coh_v(),
-                                        ram_rl_entry_chan_inst_target_vid_mem_v()));
+                                ram_rl_entry_chan_inst_target_sys_mem_ncoh_v(),
+                                ram_rl_entry_chan_inst_target_vid_mem_v()));
 
         addr_lo = u64_lo32(c->userd_iova) >>
                         ram_rl_entry_chan_userd_ptr_align_shift_v();