diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/nvgpu_mem.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c index 9f3b6cfa..8ba119a6 100644 --- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c | |||
@@ -229,8 +229,9 @@ void nvgpu_mem_wr32(struct gk20a *g, struct nvgpu_mem *mem, u32 w, u32 data) | |||
229 | ptr[w] = data; | 229 | ptr[w] = data; |
230 | } else if (mem->aperture == APERTURE_VIDMEM) { | 230 | } else if (mem->aperture == APERTURE_VIDMEM) { |
231 | nvgpu_pramin_wr_n(g, mem, w * sizeof(u32), sizeof(u32), &data); | 231 | nvgpu_pramin_wr_n(g, mem, w * sizeof(u32), sizeof(u32), &data); |
232 | if (!mem->skip_wmb) | 232 | if (!mem->skip_wmb) { |
233 | nvgpu_wmb(); | 233 | nvgpu_wmb(); |
234 | } | ||
234 | } else { | 235 | } else { |
235 | WARN_ON("Accessing unallocated nvgpu_mem"); | 236 | WARN_ON("Accessing unallocated nvgpu_mem"); |
236 | } | 237 | } |
@@ -255,8 +256,9 @@ void nvgpu_mem_wr_n(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, | |||
255 | memcpy(dest, src, size); | 256 | memcpy(dest, src, size); |
256 | } else if (mem->aperture == APERTURE_VIDMEM) { | 257 | } else if (mem->aperture == APERTURE_VIDMEM) { |
257 | nvgpu_pramin_wr_n(g, mem, offset, size, src); | 258 | nvgpu_pramin_wr_n(g, mem, offset, size, src); |
258 | if (!mem->skip_wmb) | 259 | if (!mem->skip_wmb) { |
259 | nvgpu_wmb(); | 260 | nvgpu_wmb(); |
261 | } | ||
260 | } else { | 262 | } else { |
261 | WARN_ON("Accessing unallocated nvgpu_mem"); | 263 | WARN_ON("Accessing unallocated nvgpu_mem"); |
262 | } | 264 | } |
@@ -280,8 +282,9 @@ void nvgpu_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, | |||
280 | u32 repeat_value = c | (c << 8) | (c << 16) | (c << 24); | 282 | u32 repeat_value = c | (c << 8) | (c << 16) | (c << 24); |
281 | 283 | ||
282 | nvgpu_pramin_memset(g, mem, offset, size, repeat_value); | 284 | nvgpu_pramin_memset(g, mem, offset, size, repeat_value); |
283 | if (!mem->skip_wmb) | 285 | if (!mem->skip_wmb) { |
284 | nvgpu_wmb(); | 286 | nvgpu_wmb(); |
287 | } | ||
285 | } else { | 288 | } else { |
286 | WARN_ON("Accessing unallocated nvgpu_mem"); | 289 | WARN_ON("Accessing unallocated nvgpu_mem"); |
287 | } | 290 | } |