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/gk20a/bus_gk20a.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/gk20a/bus_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/bus_gk20a.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c index b2800772..7f0cfe58 100644 --- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c | |||
@@ -21,7 +21,6 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/page_allocator.h> | 23 | #include <nvgpu/page_allocator.h> |
24 | #include <nvgpu/enabled.h> | ||
25 | #include <nvgpu/log.h> | 24 | #include <nvgpu/log.h> |
26 | #include <nvgpu/soc.h> | 25 | #include <nvgpu/soc.h> |
27 | #include <nvgpu/bus.h> | 26 | #include <nvgpu/bus.h> |
@@ -156,9 +155,8 @@ int gk20a_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst) | |||
156 | 155 | ||
157 | gk20a_writel(g, bus_bar1_block_r(), | 156 | gk20a_writel(g, bus_bar1_block_r(), |
158 | nvgpu_aperture_mask(g, bar1_inst, | 157 | nvgpu_aperture_mask(g, bar1_inst, |
159 | bus_bar1_block_target_sys_mem_ncoh_f(), | 158 | bus_bar1_block_target_sys_mem_ncoh_f(), |
160 | bus_bar1_block_target_sys_mem_coh_f(), | 159 | bus_bar1_block_target_vid_mem_f()) | |
161 | bus_bar1_block_target_vid_mem_f()) | | ||
162 | bus_bar1_block_mode_virtual_f() | | 160 | bus_bar1_block_mode_virtual_f() | |
163 | bus_bar1_block_ptr_f(ptr_v)); | 161 | bus_bar1_block_ptr_f(ptr_v)); |
164 | 162 | ||