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/include/nvgpu/mem_desc.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'drivers/gpu/nvgpu/include') diff --git a/drivers/gpu/nvgpu/include/nvgpu/mem_desc.h b/drivers/gpu/nvgpu/include/nvgpu/mem_desc.h index 528fd7bc..42d8854a 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/mem_desc.h +++ b/drivers/gpu/nvgpu/include/nvgpu/mem_desc.h @@ -28,11 +28,11 @@ struct gk20a; struct nvgpu_allocator; /* - * Real location of a buffer - gk20a_aperture_mask() will deduce what will be + * Real location of a buffer - nvgpu_aperture_mask() will deduce what will be * told to the gpu about the aperture, but this flag designates where the * memory actually was allocated from. */ -enum gk20a_aperture { +enum nvgpu_aperture { APERTURE_INVALID, /* unallocated or N/A */ APERTURE_SYSMEM, APERTURE_VIDMEM @@ -42,7 +42,7 @@ struct mem_desc { void *cpu_va; /* sysmem only */ struct page **pages; /* sysmem only */ struct sg_table *sgt; - enum gk20a_aperture aperture; + enum nvgpu_aperture aperture; size_t size; u64 gpu_va; bool fixed; /* vidmem only */ @@ -65,7 +65,7 @@ struct mem_desc_sub { u32 size; }; -static inline const char *gk20a_aperture_str(enum gk20a_aperture aperture) +static inline const char *nvgpu_aperture_str(enum nvgpu_aperture aperture) { switch (aperture) { case APERTURE_INVALID: return "invalid"; @@ -80,32 +80,32 @@ static inline const char *gk20a_aperture_str(enum gk20a_aperture aperture) * kernel mapping for this buffer. */ -int gk20a_mem_begin(struct gk20a *g, struct mem_desc *mem); +int nvgpu_mem_begin(struct gk20a *g, struct mem_desc *mem); /* nop for null mem, like with free() or vunmap() */ -void gk20a_mem_end(struct gk20a *g, struct mem_desc *mem); +void nvgpu_mem_end(struct gk20a *g, struct mem_desc *mem); /* word-indexed offset */ -u32 gk20a_mem_rd32(struct gk20a *g, struct mem_desc *mem, u32 w); +u32 nvgpu_mem_rd32(struct gk20a *g, struct mem_desc *mem, u32 w); /* byte offset (32b-aligned) */ -u32 gk20a_mem_rd(struct gk20a *g, struct mem_desc *mem, u32 offset); +u32 nvgpu_mem_rd(struct gk20a *g, struct mem_desc *mem, u32 offset); /* memcpy to cpu, offset and size in bytes (32b-aligned) */ -void gk20a_mem_rd_n(struct gk20a *g, struct mem_desc *mem, u32 offset, +void nvgpu_mem_rd_n(struct gk20a *g, struct mem_desc *mem, u32 offset, void *dest, u32 size); /* word-indexed offset */ -void gk20a_mem_wr32(struct gk20a *g, struct mem_desc *mem, u32 w, u32 data); +void nvgpu_mem_wr32(struct gk20a *g, struct mem_desc *mem, u32 w, u32 data); /* byte offset (32b-aligned) */ -void gk20a_mem_wr(struct gk20a *g, struct mem_desc *mem, u32 offset, u32 data); +void nvgpu_mem_wr(struct gk20a *g, struct mem_desc *mem, u32 offset, u32 data); /* memcpy from cpu, offset and size in bytes (32b-aligned) */ -void gk20a_mem_wr_n(struct gk20a *g, struct mem_desc *mem, u32 offset, +void nvgpu_mem_wr_n(struct gk20a *g, struct mem_desc *mem, u32 offset, void *src, u32 size); /* size and offset in bytes (32b-aligned), filled with the constant byte c */ -void gk20a_memset(struct gk20a *g, struct mem_desc *mem, u32 offset, +void nvgpu_memset(struct gk20a *g, struct mem_desc *mem, u32 offset, u32 c, u32 size); -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); #endif -- cgit v1.2.2