3 files changed, 43 insertions, 27 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
index b19398a6..27ddbca1 100644
--- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
@@ -43,7 +43,20 @@
 
 #include <nvgpu/hw/gk20a/hw_proj_gk20a.h>
 
-static struct gpu_ops gk20a_ops = {
+static const struct gpu_ops gk20a_ops = {
+        .ltc = {
+                .determine_L2_size_bytes = gk20a_determine_L2_size_bytes,
+                .init_comptags = gk20a_ltc_init_comptags,
+                .cbc_ctrl = gk20a_ltc_cbc_ctrl,
+                .set_zbc_color_entry = gk20a_ltc_set_zbc_color_entry,
+                .set_zbc_depth_entry = gk20a_ltc_set_zbc_depth_entry,
+                .init_cbc = gk20a_ltc_init_cbc,
+#ifdef CONFIG_DEBUG_FS
+                .sync_debugfs = gk20a_ltc_sync_debugfs,
+#endif
+                .init_fs_state = gk20a_ltc_init_fs_state,
+                .isr = gk20a_ltc_isr,
+        },
         .clock_gating = {
                 .slcg_gr_load_gating_prod =
                         gr_gk20a_slcg_gr_load_gating_prod,
@@ -151,6 +164,7 @@ int gk20a_init_hal(struct gk20a *g)
         struct gpu_ops *gops = &g->ops;
         struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics;
 
+        gops->ltc = gk20a_ops.ltc;
         gops->clock_gating = gk20a_ops.clock_gating;
         gops->privsecurity = 0;
         gops->securegpccs = 0;
@@ -158,7 +172,6 @@ int gk20a_init_hal(struct gk20a *g)
         gk20a_init_bus(gops);
         gk20a_init_mc(gops);
         gk20a_init_priv_ring(gops);
-        gk20a_init_ltc(gops);
         gk20a_init_gr_ops(gops);
         gk20a_init_fecs_trace_ops(gops);
         gk20a_init_fb(gops);
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
index 1d517c27..9220685a 100644
--- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
@@ -51,7 +51,7 @@ int gk20a_ltc_alloc_virt_cbc(struct gk20a *g, size_t compbit_backing_size)
 }
 
 /* HW reg dependent stuff: */
-static int gk20a_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
+int gk20a_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
 {
         /* max memory size (MB) to cover */
         u32 max_size = gr->max_comptag_mem;
@@ -125,7 +125,7 @@ static int gk20a_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         return 0;
 }
 
-static int gk20a_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
+int gk20a_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
                               u32 min, u32 max)
 {
         int err = 0;
@@ -196,14 +196,14 @@ out:
 }
 
 
-static void gk20a_ltc_init_fs_state(struct gk20a *g)
+void gk20a_ltc_init_fs_state(struct gk20a *g)
 {
         gk20a_dbg_info("initialize gk20a L2");
 
         g->max_ltc_count = g->ltc_count = 1;
 }
 
-static void gk20a_ltc_isr(struct gk20a *g)
+void gk20a_ltc_isr(struct gk20a *g)
 {
         u32 intr;
 
@@ -212,7 +212,7 @@ static void gk20a_ltc_isr(struct gk20a *g)
         gk20a_writel(g, ltc_ltc0_ltss_intr_r(), intr);
 }
 
-static int gk20a_determine_L2_size_bytes(struct gk20a *g)
+int gk20a_determine_L2_size_bytes(struct gk20a *g)
 {
         u32 lts_per_ltc;
         u32 ways;
@@ -256,7 +256,7 @@ static int gk20a_determine_L2_size_bytes(struct gk20a *g)
 /*
  * Sets the ZBC color for the passed index.
  */
-static void gk20a_ltc_set_zbc_color_entry(struct gk20a *g,
+void gk20a_ltc_set_zbc_color_entry(struct gk20a *g,
                                           struct zbc_entry *color_val,
                                           u32 index)
 {
@@ -277,7 +277,7 @@ static void gk20a_ltc_set_zbc_color_entry(struct gk20a *g,
 /*
  * Sets the ZBC depth for the passed index.
  */
-static void gk20a_ltc_set_zbc_depth_entry(struct gk20a *g,
+void gk20a_ltc_set_zbc_depth_entry(struct gk20a *g,
                                           struct zbc_entry *depth_val,
                                           u32 index)
 {
@@ -292,7 +292,7 @@ static void gk20a_ltc_set_zbc_depth_entry(struct gk20a *g,
         gk20a_readl(g, ltc_ltcs_ltss_dstg_zbc_index_r());
 }
 
-static void gk20a_ltc_init_cbc(struct gk20a *g, struct gr_gk20a *gr)
+void gk20a_ltc_init_cbc(struct gk20a *g, struct gr_gk20a *gr)
 {
         u32 max_size = gr->max_comptag_mem;
         u32 max_comptag_lines = max_size << 3;
@@ -342,7 +342,7 @@ static void gk20a_ltc_init_cbc(struct gk20a *g, struct gr_gk20a *gr)
 }
 
 #ifdef CONFIG_DEBUG_FS
-static void gk20a_ltc_sync_debugfs(struct gk20a *g)
+void gk20a_ltc_sync_debugfs(struct gk20a *g)
 {
         u32 reg_f = ltc_ltcs_ltss_tstg_set_mgmt_2_l2_bypass_mode_enabled_f();
 
@@ -363,18 +363,3 @@ static void gk20a_ltc_sync_debugfs(struct gk20a *g)
         nvgpu_spinlock_release(&g->debugfs_lock);
 }
 #endif
-
-void gk20a_init_ltc(struct gpu_ops *gops)
-{
-        gops->ltc.determine_L2_size_bytes = gk20a_determine_L2_size_bytes;
-        gops->ltc.init_comptags = gk20a_ltc_init_comptags;
-        gops->ltc.cbc_ctrl = gk20a_ltc_cbc_ctrl;
-        gops->ltc.set_zbc_color_entry = gk20a_ltc_set_zbc_color_entry;
-        gops->ltc.set_zbc_depth_entry = gk20a_ltc_set_zbc_depth_entry;
-        gops->ltc.init_cbc = gk20a_ltc_init_cbc;
-#ifdef CONFIG_DEBUG_FS
-        gops->ltc.sync_debugfs = gk20a_ltc_sync_debugfs;
-#endif
-        gops->ltc.init_fs_state = gk20a_ltc_init_fs_state;
-        gops->ltc.isr = gk20a_ltc_isr;
-}
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.h b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.h
index 30d4163f..ee7d7f91 100644
--- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.h
@@ -16,8 +16,26 @@
 #ifndef LTC_GK20A_H
 #define LTC_GK20A_H
 struct gpu_ops;
+struct gr_gk20a;
+struct zbc_entry;
+enum gk20a_cbc_op;
 
-void gk20a_init_ltc(struct gpu_ops *gops);
+int gk20a_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr);
+int gk20a_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
+                              u32 min, u32 max);
+void gk20a_ltc_init_fs_state(struct gk20a *g);
+void gk20a_ltc_isr(struct gk20a *g);
+int gk20a_determine_L2_size_bytes(struct gk20a *g);
+void gk20a_ltc_set_zbc_color_entry(struct gk20a *g,
+                                          struct zbc_entry *color_val,
+                                          u32 index);
+void gk20a_ltc_set_zbc_depth_entry(struct gk20a *g,
+                                          struct zbc_entry *depth_val,
+                                          u32 index);
+void gk20a_ltc_init_cbc(struct gk20a *g, struct gr_gk20a *gr);
+#ifdef CONFIG_DEBUG_FS
+void gk20a_ltc_sync_debugfs(struct gk20a *g);
+#endif
 int gk20a_ltc_alloc_phys_cbc(struct gk20a *g, size_t compbit_backing_size);
 int gk20a_ltc_alloc_virt_cbc(struct gk20a *g, size_t compbit_backing_size);
 #endif