summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-10-10 15:28:02 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-10-11 17:40:22 -0400
commit60b655330a233fd0ea1ab97341e025284d55186f (patch)
treea9855515961a27a1874f13836344ecc956f78b49 /drivers/gpu/nvgpu/gk20a
parentc53b94f1dd45384c2234e8c3f712df10395d0601 (diff)
gpu: nvgpu: Remove SGL reference from mm_gk20a.c
Remove an SGL reference from the mm_gk20a.c code. This code is common code and as such all linuxisms need to be fixed. It just so happens that this particular function is only used by the CDE code which is only present in Linux. So simply move this function over to the CDE code. JIRA NVGPU-30 JIRA NVGPU-225 JIRA NVGPU-226 Change-Id: Ifb0cb427c742c6d9cada382ace4a52f52474c379 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1576436 Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.c15
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.h1
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 32c74f3a..670e16d0 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -717,21 +717,6 @@ int setup_buffer_kind_and_compression(struct vm_gk20a *vm,
717 return 0; 717 return 0;
718} 718}
719 719
720dma_addr_t gk20a_mm_gpuva_to_iova_base(struct vm_gk20a *vm, u64 gpu_vaddr)
721{
722 struct nvgpu_mapped_buf *buffer;
723 dma_addr_t addr = 0;
724 struct gk20a *g = gk20a_from_vm(vm);
725
726 nvgpu_mutex_acquire(&vm->update_gmmu_lock);
727 buffer = __nvgpu_vm_find_mapped_buf(vm, gpu_vaddr);
728 if (buffer)
729 addr = nvgpu_mem_get_addr_sgl(g, buffer->sgt->sgl);
730 nvgpu_mutex_release(&vm->update_gmmu_lock);
731
732 return addr;
733}
734
735/* for gk20a the "video memory" apertures here are misnomers. */ 720/* for gk20a the "video memory" apertures here are misnomers. */
736static inline u32 big_valid_pde0_bits(struct gk20a *g, 721static inline u32 big_valid_pde0_bits(struct gk20a *g,
737 struct nvgpu_gmmu_pd *pd, u64 addr) 722 struct nvgpu_gmmu_pd *pd, u64 addr)
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index 3a8fea45..448496f5 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -383,7 +383,6 @@ int __gk20a_vm_bind_channel(struct vm_gk20a *vm, struct channel_gk20a *ch);
383 383
384void gk20a_get_comptags(struct device *dev, struct dma_buf *dmabuf, 384void gk20a_get_comptags(struct device *dev, struct dma_buf *dmabuf,
385 struct gk20a_comptags *comptags); 385 struct gk20a_comptags *comptags);
386dma_addr_t gk20a_mm_gpuva_to_iova_base(struct vm_gk20a *vm, u64 gpu_vaddr);
387 386
388int gk20a_dmabuf_alloc_drvdata(struct dma_buf *dmabuf, struct device *dev); 387int gk20a_dmabuf_alloc_drvdata(struct dma_buf *dmabuf, struct device *dev);
389 388