diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-02-28 12:19:19 -0500 |
---|---|---|
committer | Srikar Srimath Tirumala <srikars@nvidia.com> | 2018-02-28 16:49:22 -0500 |
commit | 5a35a95654d561fce09a3b9abf6b82bb7a29d74b (patch) | |
tree | 119a07134188d8e06c29a570dd8c6b143f39c9e1 /drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |
parent | 3fdd8e38b280123fd13bcc4f3fd8928c15e94db6 (diff) |
Revert "gpu: nvgpu: Get coherency on gv100 + NVLINK working"
Also revert other changes related to IO coherence. This may be the
culprit in a recent dev-kernel lockdown.
Bug 2070609
Change-Id: Ida178aef161fadbc6db9512521ea51c702c1564b
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1665914
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Srikar Srimath Tirumala <srikars@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/fifo_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 10 |
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 6b4b07a6..97ab7aab 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) | |||
101 | c->runqueue_sel) | | 101 | c->runqueue_sel) | |
102 | ram_rl_entry_chan_userd_target_f( | 102 | ram_rl_entry_chan_userd_target_f( |
103 | nvgpu_aperture_mask(g, &g->fifo.userd, | 103 | nvgpu_aperture_mask(g, &g->fifo.userd, |
104 | ram_rl_entry_chan_userd_target_sys_mem_ncoh_v(), | 104 | ram_rl_entry_chan_userd_target_sys_mem_ncoh_v(), |
105 | ram_rl_entry_chan_userd_target_sys_mem_coh_v(), | 105 | ram_rl_entry_chan_userd_target_vid_mem_v())) | |
106 | ram_rl_entry_chan_userd_target_vid_mem_v())) | | ||
107 | ram_rl_entry_chan_inst_target_f( | 106 | ram_rl_entry_chan_inst_target_f( |
108 | nvgpu_aperture_mask(g, &c->inst_block, | 107 | nvgpu_aperture_mask(g, &c->inst_block, |
109 | ram_rl_entry_chan_inst_target_sys_mem_ncoh_v(), | 108 | ram_rl_entry_chan_inst_target_sys_mem_ncoh_v(), |
110 | ram_rl_entry_chan_inst_target_sys_mem_coh_v(), | 109 | ram_rl_entry_chan_inst_target_vid_mem_v())); |
111 | ram_rl_entry_chan_inst_target_vid_mem_v())); | ||
112 | 110 | ||
113 | addr_lo = u64_lo32(c->userd_iova) >> | 111 | addr_lo = u64_lo32(c->userd_iova) >> |
114 | ram_rl_entry_chan_userd_ptr_align_shift_v(); | 112 | ram_rl_entry_chan_userd_ptr_align_shift_v(); |