diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fb_gv11b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c index 384dfb20..a44589d5 100644 --- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <nvgpu/log.h> | 19 | #include <nvgpu/log.h> |
20 | #include <nvgpu/enabled.h> | 20 | #include <nvgpu/enabled.h> |
21 | #include <nvgpu/gmmu.h> | 21 | #include <nvgpu/gmmu.h> |
22 | #include <nvgpu/barrier.h> | ||
22 | 23 | ||
23 | #include "gk20a/gk20a.h" | 24 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/kind_gk20a.h" | 25 | #include "gk20a/kind_gk20a.h" |
@@ -721,7 +722,7 @@ static void gv11b_fb_fault_buffer_get_ptr_update(struct gk20a *g, | |||
721 | /* make sure get ptr update is visible to everyone to avoid | 722 | /* make sure get ptr update is visible to everyone to avoid |
722 | * reading already read entry | 723 | * reading already read entry |
723 | */ | 724 | */ |
724 | mb(); | 725 | nvgpu_mb(); |
725 | } | 726 | } |
726 | 727 | ||
727 | static u32 gv11b_fb_fault_buffer_get_index(struct gk20a *g, | 728 | static u32 gv11b_fb_fault_buffer_get_index(struct gk20a *g, |
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index c2792414..48d14e74 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <nvgpu/soc.h> | 24 | #include <nvgpu/soc.h> |
25 | #include <nvgpu/debug.h> | 25 | #include <nvgpu/debug.h> |
26 | #include <nvgpu/nvhost_t19x.h> | 26 | #include <nvgpu/nvhost_t19x.h> |
27 | #include <nvgpu/barrier.h> | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | #include "gk20a/fifo_gk20a.h" | 30 | #include "gk20a/fifo_gk20a.h" |
@@ -247,7 +248,7 @@ void gv11b_userd_gp_put(struct gk20a *g, struct channel_gk20a *c) | |||
247 | nvgpu_mem_wr32(g, userd_mem, offset + ram_userd_gp_put_w(), | 248 | nvgpu_mem_wr32(g, userd_mem, offset + ram_userd_gp_put_w(), |
248 | c->gpfifo.put); | 249 | c->gpfifo.put); |
249 | /* commit everything to cpu */ | 250 | /* commit everything to cpu */ |
250 | smp_mb(); | 251 | nvgpu_smp_mb(); |
251 | 252 | ||
252 | gv11b_ring_channel_doorbell(c); | 253 | gv11b_ring_channel_doorbell(c); |
253 | } | 254 | } |