diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index c77bebf8..2fdc1729 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h | |||
@@ -336,7 +336,6 @@ void gk20a_mm_dump_vm(struct vm_gk20a *vm, | |||
336 | 336 | ||
337 | int gk20a_mm_suspend(struct gk20a *g); | 337 | int gk20a_mm_suspend(struct gk20a *g); |
338 | 338 | ||
339 | u64 gk20a_mm_gpu_phys_addr(struct gk20a *g, u64 phys, u32 flags); | ||
340 | u64 gk20a_mm_smmu_vaddr_translate(struct gk20a *g, dma_addr_t iova); | 339 | u64 gk20a_mm_smmu_vaddr_translate(struct gk20a *g, dma_addr_t iova); |
341 | 340 | ||
342 | void gk20a_mm_ltc_isr(struct gk20a *g); | 341 | void gk20a_mm_ltc_isr(struct gk20a *g); |
@@ -361,29 +360,29 @@ static inline phys_addr_t gk20a_mem_phys(struct nvgpu_mem *mem) | |||
361 | } | 360 | } |
362 | 361 | ||
363 | u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm, | 362 | u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm, |
364 | u64 map_offset, | 363 | u64 map_offset, |
365 | struct sg_table *sgt, | 364 | struct nvgpu_mem_sgl *sgl, |
366 | u64 buffer_offset, | 365 | u64 buffer_offset, |
367 | u64 size, | 366 | u64 size, |
368 | int pgsz_idx, | 367 | int pgsz_idx, |
369 | u8 kind_v, | 368 | u8 kind_v, |
370 | u32 ctag_offset, | 369 | u32 ctag_offset, |
371 | u32 flags, | 370 | u32 flags, |
372 | int rw_flag, | 371 | int rw_flag, |
373 | bool clear_ctags, | 372 | bool clear_ctags, |
374 | bool sparse, | 373 | bool sparse, |
375 | bool priv, | 374 | bool priv, |
376 | struct vm_gk20a_mapping_batch *batch, | 375 | struct vm_gk20a_mapping_batch *batch, |
377 | enum nvgpu_aperture aperture); | 376 | enum nvgpu_aperture aperture); |
378 | 377 | ||
379 | void gk20a_locked_gmmu_unmap(struct vm_gk20a *vm, | 378 | void gk20a_locked_gmmu_unmap(struct vm_gk20a *vm, |
380 | u64 vaddr, | 379 | u64 vaddr, |
381 | u64 size, | 380 | u64 size, |
382 | int pgsz_idx, | 381 | int pgsz_idx, |
383 | bool va_allocated, | 382 | bool va_allocated, |
384 | int rw_flag, | 383 | int rw_flag, |
385 | bool sparse, | 384 | bool sparse, |
386 | struct vm_gk20a_mapping_batch *batch); | 385 | struct vm_gk20a_mapping_batch *batch); |
387 | 386 | ||
388 | struct sg_table *gk20a_mm_pin(struct device *dev, struct dma_buf *dmabuf); | 387 | struct sg_table *gk20a_mm_pin(struct device *dev, struct dma_buf *dmabuf); |
389 | void gk20a_mm_unpin(struct device *dev, struct dma_buf *dmabuf, | 388 | void gk20a_mm_unpin(struct device *dev, struct dma_buf *dmabuf, |