diff options
author | Timo Alho <talho@nvidia.com> | 2018-03-05 02:31:06 -0500 |
---|---|---|
committer | Timo Alho <talho@nvidia.com> | 2018-03-05 11:39:57 -0500 |
commit | 848af2ce6de6140323a6ffe3075bf8021e119434 (patch) | |
tree | c89f28ac819f637b554f191da2f6a0fd8d75253e /drivers/gpu/nvgpu/gk20a/bus_gk20a.c | |
parent | 89fbf39a05483917c0a9f3453fd94c724bc37375 (diff) |
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>
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 | ||