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/gm20b/fifo_gm20b.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/gm20b/fifo_gm20b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index 15612995..0762e8bd 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <nvgpu/atomic.h> | 32 | #include <nvgpu/atomic.h> |
33 | #include <nvgpu/barrier.h> | 33 | #include <nvgpu/barrier.h> |
34 | #include <nvgpu/mm.h> | 34 | #include <nvgpu/mm.h> |
35 | #include <nvgpu/enabled.h> | ||
36 | 35 | ||
37 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> | 36 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> |
38 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> | 37 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> |
@@ -52,12 +51,11 @@ void channel_gm20b_bind(struct channel_gk20a *c) | |||
52 | 51 | ||
53 | 52 | ||
54 | gk20a_writel(g, ccsr_channel_inst_r(c->chid), | 53 | gk20a_writel(g, ccsr_channel_inst_r(c->chid), |
55 | ccsr_channel_inst_ptr_f(inst_ptr) | | 54 | ccsr_channel_inst_ptr_f(inst_ptr) | |
56 | nvgpu_aperture_mask(g, &c->inst_block, | 55 | nvgpu_aperture_mask(g, &c->inst_block, |
57 | ccsr_channel_inst_target_sys_mem_ncoh_f(), | 56 | ccsr_channel_inst_target_sys_mem_ncoh_f(), |
58 | ccsr_channel_inst_target_sys_mem_coh_f(), | 57 | ccsr_channel_inst_target_vid_mem_f()) | |
59 | ccsr_channel_inst_target_vid_mem_f()) | | 58 | ccsr_channel_inst_bind_true_f()); |
60 | ccsr_channel_inst_bind_true_f()); | ||
61 | 59 | ||
62 | gk20a_writel(g, ccsr_channel_r(c->chid), | 60 | gk20a_writel(g, ccsr_channel_r(c->chid), |
63 | (gk20a_readl(g, ccsr_channel_r(c->chid)) & | 61 | (gk20a_readl(g, ccsr_channel_r(c->chid)) & |