10 files changed, 39 insertions, 15 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 8b7315f6..a2b2e53f 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -476,6 +476,11 @@ struct gpu_ops {
                                         u32 *priv_addr_table_index);
                 u32 (*fecs_ctxsw_mailbox_size)(void);
                 int (*init_sw_bundle64)(struct gk20a *g);
+                int (*alloc_global_ctx_buffers)(struct gk20a *g);
+                int (*map_global_ctx_buffers)(struct gk20a *g,
+                        struct channel_gk20a *c);
+                int (*commit_global_ctx_buffers)(struct gk20a *g,
+                        struct channel_gk20a *c, bool patch);
         } gr;
         struct {
                 void (*init_hw)(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 42e96715..5d9e3218 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -40,6 +40,7 @@
 #include <nvgpu/error_notifier.h>
 
 #include "gk20a.h"
+#include "gr_gk20a.h"
 #include "gr_ctx_gk20a.h"
 #include "gr_pri_gk20a.h"
 #include "regops_gk20a.h"
@@ -73,14 +74,6 @@
 
 static int gk20a_init_gr_bind_fecs_elpg(struct gk20a *g);
 
-/* global ctx buffer */
-static int  gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g);
-static void gr_gk20a_free_global_ctx_buffers(struct gk20a *g);
-static int  gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
-                                            struct channel_gk20a *c);
-static void gr_gk20a_unmap_global_ctx_buffers(struct gk20a *g,
-                                              struct vm_gk20a *vm,
-                                              struct nvgpu_gr_ctx *gr_ctx);
 static void gr_gk20a_free_channel_pm_ctx(struct gk20a *g,
                                          struct vm_gk20a *vm,
                                          struct nvgpu_gr_ctx *gr_ctx);
@@ -1535,7 +1528,7 @@ static int gr_gk20a_init_golden_ctx_image(struct gk20a *g,
         gk20a_writel(g, gr_fe_go_idle_timeout_r(),
                 gr_fe_go_idle_timeout_count_disabled_f());
 
-        err = gr_gk20a_commit_global_ctx_buffers(g, c, false);
+        err = g->ops.gr.commit_global_ctx_buffers(g, c, false);
         if (err)
                 goto clean_up;
 
@@ -2558,7 +2551,7 @@ static void gr_gk20a_free_global_ctx_buffers(struct gk20a *g)
         nvgpu_log_fn(g, "done");
 }
 
-static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
+int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
 {
         struct gr_gk20a *gr = &g->gr;
         int attr_buffer_size, err;
@@ -2679,8 +2672,8 @@ static void gr_gk20a_unmap_global_ctx_buffers(struct gk20a *g,
         gr_ctx->global_ctx_buffer_mapped = false;
 }
 
-static int gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
-                                        struct channel_gk20a *c)
+int gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
+                                struct channel_gk20a *c)
 {
         struct tsg_gk20a *tsg;
         struct vm_gk20a *ch_vm = c->vm;
@@ -3004,13 +2997,13 @@ int gk20a_alloc_obj_ctx(struct channel_gk20a  *c, u32 class_num, u32 flags)
                 }
 
                 /* map global buffer to channel gpu_va and commit */
-                err = gr_gk20a_map_global_ctx_buffers(g, c);
+                err = g->ops.gr.map_global_ctx_buffers(g, c);
                 if (err) {
                         nvgpu_err(g,
                                 "fail to map global ctx buffer");
                         goto out;
                 }
-                gr_gk20a_commit_global_ctx_buffers(g, c, true);
+                g->ops.gr.commit_global_ctx_buffers(g, c, true);
 
                 /* commit gr ctx buffer */
                 err = g->ops.gr.commit_inst(c, gr_ctx->mem.gpu_va);
@@ -4877,7 +4870,7 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g)
         if (err)
                 goto clean_up;
 
-        err = gr_gk20a_alloc_global_ctx_buffers(g);
+        err = g->ops.gr.alloc_global_ctx_buffers(g);
         if (err)
                 goto clean_up;
 
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 43b89b12..32bd41f2 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -806,8 +806,13 @@ void gk20a_gr_init_ctxsw_hdr_data(struct gk20a *g,
 u32 gr_gk20a_get_patch_slots(struct gk20a *g);
 int gk20a_gr_handle_notify_pending(struct gk20a *g,
                                 struct gr_gk20a_isr_data *isr_data);
+
+int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g);
+int gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
+                                struct channel_gk20a *c);
 int gr_gk20a_commit_global_ctx_buffers(struct gk20a *g,
                         struct channel_gk20a *c, bool patch);
+
 int gr_gk20a_fecs_ctx_bind_channel(struct gk20a *g,
                                         struct channel_gk20a *c);
 u32 gk20a_init_sw_bundle(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 9f93d0eb..715946be 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -327,6 +327,9 @@ static const struct gpu_ops gm20b_ops = {
                         gr_gm20b_get_pmm_per_chiplet_offset,
                 .split_fbpa_broadcast_addr = gr_gk20a_split_fbpa_broadcast_addr,
                 .fecs_ctxsw_mailbox_size = gr_fecs_ctxsw_mailbox__size_1_v,
+                .alloc_global_ctx_buffers = gr_gk20a_alloc_global_ctx_buffers,
+                .map_global_ctx_buffers = gr_gk20a_map_global_ctx_buffers,
+                .commit_global_ctx_buffers = gr_gk20a_commit_global_ctx_buffers,
         },
         .fb = {
                 .reset = fb_gk20a_reset,
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index a525d117..61c6cb0f 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -395,6 +395,9 @@ static const struct gpu_ops gp106_ops = {
                         gr_gm20b_get_pmm_per_chiplet_offset,
                 .split_fbpa_broadcast_addr = gr_gk20a_split_fbpa_broadcast_addr,
                 .fecs_ctxsw_mailbox_size = gr_fecs_ctxsw_mailbox__size_1_v,
+                .alloc_global_ctx_buffers = gr_gk20a_alloc_global_ctx_buffers,
+                .map_global_ctx_buffers = gr_gk20a_map_global_ctx_buffers,
+                .commit_global_ctx_buffers = gr_gk20a_commit_global_ctx_buffers,
         },
         .fb = {
                 .reset = gp106_fb_reset,
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index d966f49a..62164d16 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -360,6 +360,9 @@ static const struct gpu_ops gp10b_ops = {
                         gr_gm20b_get_pmm_per_chiplet_offset,
                 .split_fbpa_broadcast_addr = gr_gk20a_split_fbpa_broadcast_addr,
                 .fecs_ctxsw_mailbox_size = gr_fecs_ctxsw_mailbox__size_1_v,
+                .alloc_global_ctx_buffers = gr_gk20a_alloc_global_ctx_buffers,
+                .map_global_ctx_buffers = gr_gk20a_map_global_ctx_buffers,
+                .commit_global_ctx_buffers = gr_gk20a_commit_global_ctx_buffers,
         },
         .fb = {
                 .reset = fb_gk20a_reset,
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index b3d97f89..00840448 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -446,6 +446,9 @@ static const struct gpu_ops gv100_ops = {
                         gr_gv11b_get_pmm_per_chiplet_offset,
                 .split_fbpa_broadcast_addr = gr_gv100_split_fbpa_broadcast_addr,
                 .fecs_ctxsw_mailbox_size = gr_fecs_ctxsw_mailbox__size_1_v,
+                .alloc_global_ctx_buffers = gr_gk20a_alloc_global_ctx_buffers,
+                .map_global_ctx_buffers = gr_gk20a_map_global_ctx_buffers,
+                .commit_global_ctx_buffers = gr_gk20a_commit_global_ctx_buffers,
         },
         .fb = {
                 .reset = gv100_fb_reset,
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index cae55609..ce8f5051 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -412,6 +412,9 @@ static const struct gpu_ops gv11b_ops = {
                         gr_gv11b_get_pmm_per_chiplet_offset,
                 .split_fbpa_broadcast_addr = gr_gk20a_split_fbpa_broadcast_addr,
                 .fecs_ctxsw_mailbox_size = gr_fecs_ctxsw_mailbox__size_1_v,
+                .alloc_global_ctx_buffers = gr_gk20a_alloc_global_ctx_buffers,
+                .map_global_ctx_buffers = gr_gk20a_map_global_ctx_buffers,
+                .commit_global_ctx_buffers = gr_gk20a_commit_global_ctx_buffers,
         },
         .fb = {
                 .reset = gv11b_fb_reset,
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index 8c2b613f..6a946a6e 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -231,6 +231,9 @@ static const struct gpu_ops vgpu_gp10b_ops = {
                 .get_pmm_per_chiplet_offset =
                         gr_gm20b_get_pmm_per_chiplet_offset,
                 .split_fbpa_broadcast_addr = gr_gk20a_split_fbpa_broadcast_addr,
+                .alloc_global_ctx_buffers = gr_gk20a_alloc_global_ctx_buffers,
+                .map_global_ctx_buffers = gr_gk20a_map_global_ctx_buffers,
+                .commit_global_ctx_buffers = gr_gk20a_commit_global_ctx_buffers,
         },
         .fb = {
                 .reset = fb_gk20a_reset,
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index 450c9c87..f81e8503 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -267,6 +267,9 @@ static const struct gpu_ops vgpu_gv11b_ops = {
                 .get_pmm_per_chiplet_offset =
                         gr_gv11b_get_pmm_per_chiplet_offset,
                 .split_fbpa_broadcast_addr = gr_gk20a_split_fbpa_broadcast_addr,
+                .alloc_global_ctx_buffers = gr_gk20a_alloc_global_ctx_buffers,
+                .map_global_ctx_buffers = gr_gk20a_map_global_ctx_buffers,
+                .commit_global_ctx_buffers = gr_gk20a_commit_global_ctx_buffers,
         },
         .fb = {
                 .reset = gv11b_fb_reset,