diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/io.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/gmmu.c | 8 |
2 files changed, 7 insertions, 7 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 | } |
diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c index 6cca8c2f..8ad7dac7 100644 --- a/drivers/gpu/nvgpu/common/mm/gmmu.c +++ b/drivers/gpu/nvgpu/common/mm/gmmu.c | |||
@@ -180,7 +180,7 @@ int nvgpu_gmmu_init_page_table(struct vm_gk20a *vm) | |||
180 | return err; | 180 | return err; |
181 | 181 | ||
182 | /* | 182 | /* |
183 | * One nvgpu_smp_mb() is done after all mapping operations. Don't need | 183 | * One nvgpu_mb() is done after all mapping operations. Don't need |
184 | * individual barriers for each PD write. | 184 | * individual barriers for each PD write. |
185 | */ | 185 | */ |
186 | vm->pdb.mem->skip_wmb = true; | 186 | vm->pdb.mem->skip_wmb = true; |
@@ -275,7 +275,7 @@ static int pd_allocate(struct vm_gk20a *vm, | |||
275 | } | 275 | } |
276 | 276 | ||
277 | /* | 277 | /* |
278 | * One nvgpu_smp_mb() is done after all mapping operations. Don't need | 278 | * One nvgpu_mb() is done after all mapping operations. Don't need |
279 | * individual barriers for each PD write. | 279 | * individual barriers for each PD write. |
280 | */ | 280 | */ |
281 | pd->mem->skip_wmb = true; | 281 | pd->mem->skip_wmb = true; |
@@ -639,7 +639,7 @@ static int __nvgpu_gmmu_update_page_table(struct vm_gk20a *vm, | |||
639 | attrs); | 639 | attrs); |
640 | 640 | ||
641 | unmap_gmmu_pages(g, &vm->pdb); | 641 | unmap_gmmu_pages(g, &vm->pdb); |
642 | nvgpu_smp_mb(); | 642 | nvgpu_mb(); |
643 | 643 | ||
644 | __gmmu_dbg(g, attrs, "%-5s Done!", sgt ? "MAP" : "UNMAP"); | 644 | __gmmu_dbg(g, attrs, "%-5s Done!", sgt ? "MAP" : "UNMAP"); |
645 | 645 | ||
@@ -914,7 +914,7 @@ int __nvgpu_set_pte(struct gk20a *g, struct vm_gk20a *vm, u64 vaddr, u32 *pte) | |||
914 | * There probably also needs to be a TLB invalidate as well but we leave | 914 | * There probably also needs to be a TLB invalidate as well but we leave |
915 | * that to the caller of this function. | 915 | * that to the caller of this function. |
916 | */ | 916 | */ |
917 | nvgpu_smp_wmb(); | 917 | nvgpu_wmb(); |
918 | 918 | ||
919 | return 0; | 919 | return 0; |
920 | } | 920 | } |