diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2014-06-10 02:59:39 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:16 -0400 |
commit | 6838d9f05e0d712925f759b90c830b2d513ce7a6 (patch) | |
tree | 64dd2393bfb2a650e101438be847eda31a1d2b37 /drivers/gpu/nvgpu | |
parent | b7793a493a1fa292a22d5ce84c43ee342b9824b2 (diff) |
gpu: nvgpu: add explicit wmb() before reg write
Add explict memory barrier wmb() before writing to register values.
Also call writel_relaxed() instead of writel() to skip internal
wmb() call which is conditional on some configs.
Bug 200012037
Change-Id: I9c545138314b6e73fec2a4aff2b1956444fac806
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/421463
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Tested-by: Krishna Reddy <vdumpa@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index da5cc917..9769ac99 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -483,7 +483,8 @@ static inline void gk20a_mem_wr32(void *ptr, int w, u32 data) | |||
483 | static inline void gk20a_writel(struct gk20a *g, u32 r, u32 v) | 483 | static inline void gk20a_writel(struct gk20a *g, u32 r, u32 v) |
484 | { | 484 | { |
485 | gk20a_dbg(gpu_dbg_reg, " r=0x%x v=0x%x", r, v); | 485 | gk20a_dbg(gpu_dbg_reg, " r=0x%x v=0x%x", r, v); |
486 | writel(v, g->regs + r); | 486 | wmb(); |
487 | writel_relaxed(v, g->regs + r); | ||
487 | } | 488 | } |
488 | static inline u32 gk20a_readl(struct gk20a *g, u32 r) | 489 | static inline u32 gk20a_readl(struct gk20a *g, u32 r) |
489 | { | 490 | { |
@@ -495,7 +496,8 @@ static inline u32 gk20a_readl(struct gk20a *g, u32 r) | |||
495 | static inline void gk20a_bar1_writel(struct gk20a *g, u32 b, u32 v) | 496 | static inline void gk20a_bar1_writel(struct gk20a *g, u32 b, u32 v) |
496 | { | 497 | { |
497 | gk20a_dbg(gpu_dbg_reg, " b=0x%x v=0x%x", b, v); | 498 | gk20a_dbg(gpu_dbg_reg, " b=0x%x v=0x%x", b, v); |
498 | writel(v, g->bar1 + b); | 499 | wmb(); |
500 | writel_relaxed(v, g->bar1 + b); | ||
499 | } | 501 | } |
500 | 502 | ||
501 | static inline u32 gk20a_bar1_readl(struct gk20a *g, u32 b) | 503 | static inline u32 gk20a_bar1_readl(struct gk20a *g, u32 b) |