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/mm_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/mm_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/mm_gv11b.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c index b46ecb0a..ade1d9fe 100644 --- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <nvgpu/dma.h> | 26 | #include <nvgpu/dma.h> |
27 | #include <nvgpu/log.h> | 27 | #include <nvgpu/log.h> |
28 | #include <nvgpu/mm.h> | 28 | #include <nvgpu/mm.h> |
29 | #include <nvgpu/enabled.h> | ||
30 | 29 | ||
31 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
32 | #include "gk20a/mm_gk20a.h" | 31 | #include "gk20a/mm_gk20a.h" |
@@ -293,9 +292,8 @@ int gv11b_init_bar2_mm_hw_setup(struct gk20a *g) | |||
293 | 292 | ||
294 | gk20a_writel(g, bus_bar2_block_r(), | 293 | gk20a_writel(g, bus_bar2_block_r(), |
295 | nvgpu_aperture_mask(g, inst_block, | 294 | nvgpu_aperture_mask(g, inst_block, |
296 | bus_bar2_block_target_sys_mem_ncoh_f(), | 295 | bus_bar2_block_target_sys_mem_ncoh_f(), |
297 | bus_bar2_block_target_sys_mem_coh_f(), | 296 | bus_bar2_block_target_vid_mem_f()) | |
298 | bus_bar2_block_target_vid_mem_f()) | | ||
299 | bus_bar2_block_mode_virtual_f() | | 297 | bus_bar2_block_mode_virtual_f() | |
300 | bus_bar2_block_ptr_f(inst_pa)); | 298 | bus_bar2_block_ptr_f(inst_pa)); |
301 | 299 | ||