2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index e6630ebf..115cd7f4 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -27,6 +27,7 @@ struct fifo_gk20a;
 struct channel_gk20a;
 struct gr_gk20a;
 struct sim_gk20a;
+struct gk20a_ctxsw_ucode_segments;
 
 #include <linux/sched.h>
 #include <linux/spinlock.h>
@@ -121,6 +122,10 @@ struct gpu_ops {
                 void (*set_hww_esr_report_mask)(struct gk20a *g);
                 int (*setup_alpha_beta_tables)(struct gk20a *g,
                                               struct gr_gk20a *gr);
+                int (*falcon_load_ucode)(struct gk20a *g,
+                                u64 addr_base,
+                                struct gk20a_ctxsw_ucode_segments *segments,
+                                u32 reg_offset);
         } gr;
         const char *name;
         struct {
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 46a84fd6..50ca0601 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -2141,10 +2141,10 @@ static void gr_gk20a_load_falcon_with_bootloader(struct gk20a *g)
 
         gr_gk20a_load_falcon_bind_instblk(g);
 
-        gr_gk20a_load_ctxsw_ucode_segments(g, addr_base,
+        g->ops.gr.falcon_load_ucode(g, addr_base,
                 &g->ctxsw_ucode_info.fecs, 0);
 
-        gr_gk20a_load_ctxsw_ucode_segments(g, addr_base,
+        g->ops.gr.falcon_load_ucode(g, addr_base,
                 &g->ctxsw_ucode_info.gpccs,
                 gr_gpcs_gpccs_falcon_hwcfg_r() -
                 gr_fecs_falcon_hwcfg_r());
@@ -6845,4 +6845,5 @@ void gk20a_init_gr(struct gpu_ops *gops)
         gops->gr.init_fs_state = gr_gk20a_ctx_state_floorsweep;
         gops->gr.set_hww_esr_report_mask = gr_gk20a_set_hww_esr_report_mask;
         gops->gr.setup_alpha_beta_tables = gr_gk20a_setup_alpha_beta_tables;
+        gops->gr.falcon_load_ucode = gr_gk20a_load_ctxsw_ucode_segments;
 }