diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-03-06 13:43:16 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-03-07 21:04:41 -0500 |
commit | 418f31cd91a5c3ca45f0920ed64205def49c8a80 (patch) | |
tree | 17e3e04065679788aeeff645842866df0d59ccd0 /drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |
parent | f85a0d3e00b53453f3d5ca556f15465078473f31 (diff) |
gpu: nvgpu: Enable IO coherency on GV100
This reverts commit 848af2ce6de6140323a6ffe3075bf8021e119434.
This is a revert of a revert, etc, etc. It re-enables IO coherence again.
JIRA EVLR-2333
Change-Id: Ibf97dce2f892e48a1200a06cd38a1c5d9603be04
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1669722
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@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, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index c82fb1cc..1436a260 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -25,6 +25,7 @@ | |||
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> | ||
28 | 29 | ||
29 | #include "fifo_gp10b.h" | 30 | #include "fifo_gp10b.h" |
30 | 31 | ||
@@ -78,8 +79,9 @@ int channel_gp10b_commit_userd(struct channel_gk20a *c) | |||
78 | nvgpu_mem_wr32(g, &c->inst_block, | 79 | nvgpu_mem_wr32(g, &c->inst_block, |
79 | ram_in_ramfc_w() + ram_fc_userd_w(), | 80 | ram_in_ramfc_w() + ram_fc_userd_w(), |
80 | nvgpu_aperture_mask(g, &g->fifo.userd, | 81 | nvgpu_aperture_mask(g, &g->fifo.userd, |
81 | pbdma_userd_target_sys_mem_ncoh_f(), | 82 | pbdma_userd_target_sys_mem_ncoh_f(), |
82 | pbdma_userd_target_vid_mem_f()) | | 83 | pbdma_userd_target_sys_mem_coh_f(), |
84 | pbdma_userd_target_vid_mem_f()) | | ||
83 | pbdma_userd_addr_f(addr_lo)); | 85 | pbdma_userd_addr_f(addr_lo)); |
84 | 86 | ||
85 | nvgpu_mem_wr32(g, &c->inst_block, | 87 | nvgpu_mem_wr32(g, &c->inst_block, |