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/gp10b/fifo_gp10b.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/gp10b/fifo_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 1436a260..c82fb1cc 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
26 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
27 | #include <nvgpu/log2.h> | 27 | #include <nvgpu/log2.h> |
28 | #include <nvgpu/enabled.h> | ||
29 | 28 | ||
30 | #include "fifo_gp10b.h" | 29 | #include "fifo_gp10b.h" |
31 | 30 | ||
@@ -79,9 +78,8 @@ int channel_gp10b_commit_userd(struct channel_gk20a *c) | |||
79 | nvgpu_mem_wr32(g, &c->inst_block, | 78 | nvgpu_mem_wr32(g, &c->inst_block, |
80 | ram_in_ramfc_w() + ram_fc_userd_w(), | 79 | ram_in_ramfc_w() + ram_fc_userd_w(), |
81 | nvgpu_aperture_mask(g, &g->fifo.userd, | 80 | nvgpu_aperture_mask(g, &g->fifo.userd, |
82 | pbdma_userd_target_sys_mem_ncoh_f(), | 81 | pbdma_userd_target_sys_mem_ncoh_f(), |
83 | pbdma_userd_target_sys_mem_coh_f(), | 82 | pbdma_userd_target_vid_mem_f()) | |
84 | pbdma_userd_target_vid_mem_f()) | | ||
85 | pbdma_userd_addr_f(addr_lo)); | 83 | pbdma_userd_addr_f(addr_lo)); |
86 | 84 | ||
87 | nvgpu_mem_wr32(g, &c->inst_block, | 85 | nvgpu_mem_wr32(g, &c->inst_block, |