diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 12 |
1 files changed, 6 insertions, 6 deletions
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 { | |||
220 | u32 kind_v, u64 *ctag, | 220 | u32 kind_v, u64 *ctag, |
221 | bool cacheable, bool unmapped_pte, | 221 | bool cacheable, bool unmapped_pte, |
222 | int rw_flag, bool sparse, bool priv, | 222 | int rw_flag, bool sparse, bool priv, |
223 | enum gk20a_aperture aperture); | 223 | enum nvgpu_aperture aperture); |
224 | size_t entry_size; | 224 | size_t entry_size; |
225 | }; | 225 | }; |
226 | 226 | ||
@@ -514,7 +514,7 @@ u64 gk20a_gmmu_map(struct vm_gk20a *vm, | |||
514 | u32 flags, | 514 | u32 flags, |
515 | int rw_flag, | 515 | int rw_flag, |
516 | bool priv, | 516 | bool priv, |
517 | enum gk20a_aperture aperture); | 517 | enum nvgpu_aperture aperture); |
518 | u64 gk20a_gmmu_fixed_map(struct vm_gk20a *vm, | 518 | u64 gk20a_gmmu_fixed_map(struct vm_gk20a *vm, |
519 | struct sg_table **sgt, | 519 | struct sg_table **sgt, |
520 | u64 addr, | 520 | u64 addr, |
@@ -522,7 +522,7 @@ u64 gk20a_gmmu_fixed_map(struct vm_gk20a *vm, | |||
522 | u32 flags, | 522 | u32 flags, |
523 | int rw_flag, | 523 | int rw_flag, |
524 | bool priv, | 524 | bool priv, |
525 | enum gk20a_aperture aperture); | 525 | enum nvgpu_aperture aperture); |
526 | 526 | ||
527 | /* Flags for the below gk20a_gmmu_{alloc,alloc_map}_flags* */ | 527 | /* Flags for the below gk20a_gmmu_{alloc,alloc_map}_flags* */ |
528 | 528 | ||
@@ -589,9 +589,9 @@ static inline phys_addr_t gk20a_mem_phys(struct mem_desc *mem) | |||
589 | return 0; | 589 | return 0; |
590 | } | 590 | } |
591 | 591 | ||
592 | u32 __gk20a_aperture_mask(struct gk20a *g, enum gk20a_aperture aperture, | 592 | u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture, |
593 | u32 sysmem_mask, u32 vidmem_mask); | 593 | u32 sysmem_mask, u32 vidmem_mask); |
594 | u32 gk20a_aperture_mask(struct gk20a *g, struct mem_desc *mem, | 594 | u32 nvgpu_aperture_mask(struct gk20a *g, struct mem_desc *mem, |
595 | u32 sysmem_mask, u32 vidmem_mask); | 595 | u32 sysmem_mask, u32 vidmem_mask); |
596 | 596 | ||
597 | void gk20a_pde_wr32(struct gk20a *g, struct gk20a_mm_entry *entry, | 597 | 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, | |||
612 | bool sparse, | 612 | bool sparse, |
613 | bool priv, | 613 | bool priv, |
614 | struct vm_gk20a_mapping_batch *batch, | 614 | struct vm_gk20a_mapping_batch *batch, |
615 | enum gk20a_aperture aperture); | 615 | enum nvgpu_aperture aperture); |
616 | 616 | ||
617 | void gk20a_gmmu_unmap(struct vm_gk20a *vm, | 617 | void gk20a_gmmu_unmap(struct vm_gk20a *vm, |
618 | u64 vaddr, | 618 | u64 vaddr, |