diff options
author | Sunny He <suhe@nvidia.com> | 2017-08-11 17:41:33 -0400 |
---|---|---|
committer | Shu Zhong <shuz@nvidia.com> | 2017-08-11 17:57:15 -0400 |
commit | f8399cfa553b6fb6d82c7fa762c372f03bf59d5f (patch) | |
tree | 3966af83cf9abdf687667afe120cc6648a9ed360 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 8d63cd3995d4a650b478ad69d7e29ed2b1b2d927 (diff) |
Revert "gpu: nvgpu: Reorg mm HAL initialization"
Conflicts with gv100 changes
This reverts commit 8d63cd3995d4a650b478ad69d7e29ed2b1b2d927.
Change-Id: Ie2f88d281b2b87a9a794d79164a61c4d883626b7
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537668
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Tested-by: Shu Zhong <shuz@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 58558159..7b998204 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -734,17 +734,16 @@ struct gpu_ops { | |||
734 | void (*init_inst_block)(struct nvgpu_mem *inst_block, | 734 | void (*init_inst_block)(struct nvgpu_mem *inst_block, |
735 | struct vm_gk20a *vm, u32 big_page_size); | 735 | struct vm_gk20a *vm, u32 big_page_size); |
736 | bool (*mmu_fault_pending)(struct gk20a *g); | 736 | bool (*mmu_fault_pending)(struct gk20a *g); |
737 | /* This function is called to allocate secure memory (memory | ||
738 | * that the CPU cannot see). The function should fill the | ||
739 | * context buffer descriptor (especially fields destroy, sgt, | ||
740 | * size). | ||
741 | */ | ||
742 | int (*secure_alloc)(struct gk20a *g, | ||
743 | struct gr_ctx_buffer_desc *desc, | ||
744 | size_t size); | ||
737 | void (*fault_info_mem_destroy)(struct gk20a *g); | 745 | void (*fault_info_mem_destroy)(struct gk20a *g); |
738 | } mm; | 746 | } mm; |
739 | /* | ||
740 | * This function is called to allocate secure memory (memory | ||
741 | * that the CPU cannot see). The function should fill the | ||
742 | * context buffer descriptor (especially fields destroy, sgt, | ||
743 | * size). | ||
744 | */ | ||
745 | int (*secure_alloc)(struct gk20a *g, | ||
746 | struct gr_ctx_buffer_desc *desc, | ||
747 | size_t size); | ||
748 | struct { | 747 | struct { |
749 | u32 (*enter)(struct gk20a *g, struct nvgpu_mem *mem, | 748 | u32 (*enter)(struct gk20a *g, struct nvgpu_mem *mem, |
750 | struct page_alloc_chunk *chunk, u32 w); | 749 | struct page_alloc_chunk *chunk, u32 w); |