diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 18 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 1 |
2 files changed, 7 insertions, 12 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 0c1c6d8f..4ae09e89 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -234,12 +234,6 @@ static inline void pramin_access_batch_wr_n(struct gk20a *g, u32 start, | |||
234 | r += sizeof(u32); | 234 | r += sizeof(u32); |
235 | } | 235 | } |
236 | 236 | ||
237 | /* | ||
238 | * Barrier moved here from gk20a_writel in the loop. The writes don't | ||
239 | * have to be ordered. | ||
240 | */ | ||
241 | wmb(); | ||
242 | |||
243 | *arg = src_u32; | 237 | *arg = src_u32; |
244 | } | 238 | } |
245 | 239 | ||
@@ -252,12 +246,6 @@ static inline void pramin_access_batch_set(struct gk20a *g, u32 start, | |||
252 | writel_relaxed(repeat, g->regs + r); | 246 | writel_relaxed(repeat, g->regs + r); |
253 | r += sizeof(u32); | 247 | r += sizeof(u32); |
254 | } | 248 | } |
255 | |||
256 | /* | ||
257 | * Barrier moved here from gk20a_writel in the loop. The writes don't | ||
258 | * have to be ordered. | ||
259 | */ | ||
260 | wmb(); | ||
261 | } | 249 | } |
262 | 250 | ||
263 | u32 gk20a_mem_rd32(struct gk20a *g, struct mem_desc *mem, u32 w) | 251 | u32 gk20a_mem_rd32(struct gk20a *g, struct mem_desc *mem, u32 w) |
@@ -336,6 +324,8 @@ void gk20a_mem_wr32(struct gk20a *g, struct mem_desc *mem, u32 w, u32 data) | |||
336 | 324 | ||
337 | pramin_access_batched(g, mem, w * sizeof(u32), sizeof(u32), | 325 | pramin_access_batched(g, mem, w * sizeof(u32), sizeof(u32), |
338 | pramin_access_batch_wr_n, &p); | 326 | pramin_access_batch_wr_n, &p); |
327 | if (!mem->skip_wmb) | ||
328 | wmb(); | ||
339 | } else { | 329 | } else { |
340 | WARN_ON("Accessing unallocated mem_desc"); | 330 | WARN_ON("Accessing unallocated mem_desc"); |
341 | } | 331 | } |
@@ -368,6 +358,8 @@ void gk20a_mem_wr_n(struct gk20a *g, struct mem_desc *mem, u32 offset, | |||
368 | 358 | ||
369 | pramin_access_batched(g, mem, offset, size, | 359 | pramin_access_batched(g, mem, offset, size, |
370 | pramin_access_batch_wr_n, &src_u32); | 360 | pramin_access_batch_wr_n, &src_u32); |
361 | if (!mem->skip_wmb) | ||
362 | wmb(); | ||
371 | } else { | 363 | } else { |
372 | WARN_ON("Accessing unallocated mem_desc"); | 364 | WARN_ON("Accessing unallocated mem_desc"); |
373 | } | 365 | } |
@@ -398,6 +390,8 @@ void gk20a_memset(struct gk20a *g, struct mem_desc *mem, u32 offset, | |||
398 | 390 | ||
399 | pramin_access_batched(g, mem, offset, size, | 391 | pramin_access_batched(g, mem, offset, size, |
400 | pramin_access_batch_set, &p); | 392 | pramin_access_batch_set, &p); |
393 | if (!mem->skip_wmb) | ||
394 | wmb(); | ||
401 | } else { | 395 | } else { |
402 | WARN_ON("Accessing unallocated mem_desc"); | 396 | WARN_ON("Accessing unallocated mem_desc"); |
403 | } | 397 | } |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index e8f7da98..b34ff4a7 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h | |||
@@ -74,6 +74,7 @@ struct mem_desc { | |||
74 | bool user_mem; /* vidmem only */ | 74 | bool user_mem; /* vidmem only */ |
75 | struct gk20a_allocator *allocator; /* vidmem only */ | 75 | struct gk20a_allocator *allocator; /* vidmem only */ |
76 | struct list_head clear_list_entry; /* vidmem only */ | 76 | struct list_head clear_list_entry; /* vidmem only */ |
77 | bool skip_wmb; | ||
77 | }; | 78 | }; |
78 | 79 | ||
79 | struct mem_desc_sub { | 80 | struct mem_desc_sub { |