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>

2 files changed, 14 insertions, 15 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 {
                 void (*init_inst_block)(struct nvgpu_mem *inst_block,
                                 struct vm_gk20a *vm, u32 big_page_size);
                 bool (*mmu_fault_pending)(struct gk20a *g);
+                /* This function is called to allocate secure memory (memory
+                 * that the CPU cannot see). The function should fill the
+                 * context buffer descriptor (especially fields destroy, sgt,
+                 * size).
+                 */
+                int (*secure_alloc)(struct gk20a *g,
+                                    struct gr_ctx_buffer_desc *desc,
+                                    size_t size);
                 void (*fault_info_mem_destroy)(struct gk20a *g);
         } mm;
-        /*
-         * This function is called to allocate secure memory (memory
-         * that the CPU cannot see). The function should fill the
-         * context buffer descriptor (especially fields destroy, sgt,
-         * size).
-         */
-        int (*secure_alloc)(struct gk20a *g,
-                                struct gr_ctx_buffer_desc *desc,
-                                size_t size);
         struct {
                 u32 (*enter)(struct gk20a *g, struct nvgpu_mem *mem,
                              struct page_alloc_chunk *chunk, u32 w);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 608b011a..497e7ee2 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -2524,8 +2524,8 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
         if (err)
                 goto clean_up;
 
-        if (g->ops.secure_alloc)
-                g->ops.secure_alloc(g,
+        if (g->ops.mm.secure_alloc)
+                g->ops.mm.secure_alloc(g,
                                        &gr->global_ctx_buffer[CIRCULAR_VPR],
                                        cb_buffer_size);
 
@@ -2536,8 +2536,8 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
         if (err)
                 goto clean_up;
 
-        if (g->ops.secure_alloc)
-                g->ops.secure_alloc(g,
+        if (g->ops.mm.secure_alloc)
+                g->ops.mm.secure_alloc(g,
                                        &gr->global_ctx_buffer[PAGEPOOL_VPR],
                                        pagepool_buffer_size);
 
@@ -2548,8 +2548,8 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
         if (err)
                 goto clean_up;
 
-        if (g->ops.secure_alloc)
-                g->ops.secure_alloc(g,
+        if (g->ops.mm.secure_alloc)
+                g->ops.mm.secure_alloc(g,
                                        &gr->global_ctx_buffer[ATTRIBUTE_VPR],
                                        attr_buffer_size);