From b69020bff5dfa69cad926c9374cdbe9a62509ffd Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 15 Mar 2017 16:42:12 -0700 Subject: gpu: nvgpu: Rename gk20a_mem_* functions Rename the functions used for mem_desc access to nvgpu_mem_*. JIRA NVGPU-12 Change-Id: Ibfdc1112d43f0a125e4487c250e3f977ffd2cd75 Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1323325 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index da8bbb0a..3c701907 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h @@ -220,7 +220,7 @@ struct gk20a_mmu_level { u32 kind_v, u64 *ctag, bool cacheable, bool unmapped_pte, int rw_flag, bool sparse, bool priv, - enum gk20a_aperture aperture); + enum nvgpu_aperture aperture); size_t entry_size; }; @@ -514,7 +514,7 @@ u64 gk20a_gmmu_map(struct vm_gk20a *vm, u32 flags, int rw_flag, bool priv, - enum gk20a_aperture aperture); + enum nvgpu_aperture aperture); u64 gk20a_gmmu_fixed_map(struct vm_gk20a *vm, struct sg_table **sgt, u64 addr, @@ -522,7 +522,7 @@ u64 gk20a_gmmu_fixed_map(struct vm_gk20a *vm, u32 flags, int rw_flag, bool priv, - enum gk20a_aperture aperture); + enum nvgpu_aperture aperture); /* Flags for the below gk20a_gmmu_{alloc,alloc_map}_flags* */ @@ -589,9 +589,9 @@ static inline phys_addr_t gk20a_mem_phys(struct mem_desc *mem) return 0; } -u32 __gk20a_aperture_mask(struct gk20a *g, enum gk20a_aperture aperture, +u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture, u32 sysmem_mask, u32 vidmem_mask); -u32 gk20a_aperture_mask(struct gk20a *g, struct mem_desc *mem, +u32 nvgpu_aperture_mask(struct gk20a *g, struct mem_desc *mem, u32 sysmem_mask, u32 vidmem_mask); void gk20a_pde_wr32(struct gk20a *g, struct gk20a_mm_entry *entry, @@ -612,7 +612,7 @@ u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm, bool sparse, bool priv, struct vm_gk20a_mapping_batch *batch, - enum gk20a_aperture aperture); + enum nvgpu_aperture aperture); void gk20a_gmmu_unmap(struct vm_gk20a *vm, u64 vaddr, -- cgit v1.2.2