summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/linux/io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/io.c')
-rw-r--r--drivers/gpu/nvgpu/common/linux/io.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/io.c b/drivers/gpu/nvgpu/common/linux/io.c
index 04a9fbe8..729825e7 100644
--- a/drivers/gpu/nvgpu/common/linux/io.c
+++ b/drivers/gpu/nvgpu/common/linux/io.c
@@ -26,7 +26,7 @@ void nvgpu_writel(struct gk20a *g, u32 r, u32 v)
26 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v); 26 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v);
27 } else { 27 } else {
28 writel_relaxed(v, l->regs + r); 28 writel_relaxed(v, l->regs + r);
29 nvgpu_smp_wmb(); 29 nvgpu_wmb();
30 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x", r, v); 30 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x", r, v);
31 } 31 }
32} 32}
@@ -57,7 +57,7 @@ void nvgpu_writel_check(struct gk20a *g, u32 r, u32 v)
57 __gk20a_warn_on_no_regs(); 57 __gk20a_warn_on_no_regs();
58 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v); 58 gk20a_dbg(gpu_dbg_reg, "r=0x%x v=0x%x (failed)", r, v);
59 } else { 59 } else {
60 nvgpu_smp_wmb(); 60 nvgpu_wmb();
61 do { 61 do {
62 writel_relaxed(v, l->regs + r); 62 writel_relaxed(v, l->regs + r);
63 } while (readl(l->regs + r) != v); 63 } while (readl(l->regs + r) != v);
@@ -73,7 +73,7 @@ void nvgpu_bar1_writel(struct gk20a *g, u32 b, u32 v)
73 __gk20a_warn_on_no_regs(); 73 __gk20a_warn_on_no_regs();
74 gk20a_dbg(gpu_dbg_reg, "b=0x%x v=0x%x (failed)", b, v); 74 gk20a_dbg(gpu_dbg_reg, "b=0x%x v=0x%x (failed)", b, v);
75 } else { 75 } else {
76 nvgpu_smp_wmb(); 76 nvgpu_wmb();
77 writel_relaxed(v, l->bar1 + b); 77 writel_relaxed(v, l->bar1 + b);
78 gk20a_dbg(gpu_dbg_reg, "b=0x%x v=0x%x", b, v); 78 gk20a_dbg(gpu_dbg_reg, "b=0x%x v=0x%x", b, v);
79 } 79 }