diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-03-01 23:47:25 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-03-03 01:10:14 -0500 |
commit | 89fbf39a05483917c0a9f3453fd94c724bc37375 (patch) | |
tree | 55fdd147c0a7eb80b8fc50ecd9f4b0c80f1322f1 /drivers/gpu/nvgpu/gm20b | |
parent | ef116a6e632522def7493921666c3241318ce100 (diff) |
Revert "Revert "gpu: nvgpu: Get coherency on gv100 + NVLINK working""
This reverts commit 5a35a95654d561fce09a3b9abf6b82bb7a29d74b.
JIRA EVLR-2333
Change-Id: I923c32496c343d39d34f6d406c38a9f6ce7dc6e0
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1667167
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/bus_gm20b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/bus_gm20b.c b/drivers/gpu/nvgpu/gm20b/bus_gm20b.c index 34c8d4b7..cdd70d5b 100644 --- a/drivers/gpu/nvgpu/gm20b/bus_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/bus_gm20b.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/timers.h> | 25 | #include <nvgpu/timers.h> |
26 | #include <nvgpu/bus.h> | 26 | #include <nvgpu/bus.h> |
27 | #include <nvgpu/mm.h> | 27 | #include <nvgpu/mm.h> |
28 | #include <nvgpu/enabled.h> | ||
28 | 29 | ||
29 | #include "bus_gm20b.h" | 30 | #include "bus_gm20b.h" |
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
@@ -43,8 +44,9 @@ int gm20b_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst) | |||
43 | 44 | ||
44 | gk20a_writel(g, bus_bar1_block_r(), | 45 | gk20a_writel(g, bus_bar1_block_r(), |
45 | nvgpu_aperture_mask(g, bar1_inst, | 46 | nvgpu_aperture_mask(g, bar1_inst, |
46 | bus_bar1_block_target_sys_mem_ncoh_f(), | 47 | bus_bar1_block_target_sys_mem_ncoh_f(), |
47 | bus_bar1_block_target_vid_mem_f()) | | 48 | bus_bar1_block_target_sys_mem_coh_f(), |
49 | bus_bar1_block_target_vid_mem_f()) | | ||
48 | bus_bar1_block_mode_virtual_f() | | 50 | bus_bar1_block_mode_virtual_f() | |
49 | bus_bar1_block_ptr_f(ptr_v)); | 51 | bus_bar1_block_ptr_f(ptr_v)); |
50 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); | 52 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); |
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index 0762e8bd..15612995 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -32,6 +32,7 @@ | |||
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> | ||
35 | 36 | ||
36 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> | 37 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> |
37 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> | 38 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> |
@@ -51,11 +52,12 @@ void channel_gm20b_bind(struct channel_gk20a *c) | |||
51 | 52 | ||
52 | 53 | ||
53 | gk20a_writel(g, ccsr_channel_inst_r(c->chid), | 54 | gk20a_writel(g, ccsr_channel_inst_r(c->chid), |
54 | ccsr_channel_inst_ptr_f(inst_ptr) | | 55 | ccsr_channel_inst_ptr_f(inst_ptr) | |
55 | nvgpu_aperture_mask(g, &c->inst_block, | 56 | nvgpu_aperture_mask(g, &c->inst_block, |
56 | ccsr_channel_inst_target_sys_mem_ncoh_f(), | 57 | ccsr_channel_inst_target_sys_mem_ncoh_f(), |
57 | ccsr_channel_inst_target_vid_mem_f()) | | 58 | ccsr_channel_inst_target_sys_mem_coh_f(), |
58 | ccsr_channel_inst_bind_true_f()); | 59 | ccsr_channel_inst_target_vid_mem_f()) | |
60 | ccsr_channel_inst_bind_true_f()); | ||
59 | 61 | ||
60 | gk20a_writel(g, ccsr_channel_r(c->chid), | 62 | gk20a_writel(g, ccsr_channel_r(c->chid), |
61 | (gk20a_readl(g, ccsr_channel_r(c->chid)) & | 63 | (gk20a_readl(g, ccsr_channel_r(c->chid)) & |