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 @@
 #include <nvgpu/log.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/gmmu.h>
+#include <nvgpu/barrier.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/kind_gk20a.h"
@@ -721,7 +722,7 @@ static void gv11b_fb_fault_buffer_get_ptr_update(struct gk20a *g,
         /* make sure get ptr update is visible to everyone to avoid
          * reading already read entry
          */
-        mb();
+        nvgpu_mb();
 }
 
 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 @@
 #include <nvgpu/soc.h>
 #include <nvgpu/debug.h>
 #include <nvgpu/nvhost_t19x.h>
+#include <nvgpu/barrier.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -247,7 +248,7 @@ void gv11b_userd_gp_put(struct gk20a *g, struct channel_gk20a *c)
         nvgpu_mem_wr32(g, userd_mem, offset + ram_userd_gp_put_w(),
                                                         c->gpfifo.put);
         /* commit everything to cpu */
-        smp_mb();
+        nvgpu_smp_mb();
 
         gv11b_ring_channel_doorbell(c);
 }