gpu: nvgpu: Reorganize ltc HAL initialization

Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch only covers the ltc
sub-module of the gpu_ops struct.

Perform HAL function assignments in hal_gxxxx.c through the
population of a chip-specific copy of gpu_ops.

Jira NVGPU-74

Change-Id: I1110e301e57b502cf7f97e6739424cb33cc52a69
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master/r/1507564
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 3 insertions, 23 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index e4e385fb..5e938141 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -29,7 +29,7 @@
 #include "gk20a/ltc_gk20a.h"
 #include "ltc_gm20b.h"
 
-static int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
+int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
 {
         /* max memory size (MB) to cover */
         u32 max_size = gr->max_comptag_mem;
@@ -309,7 +309,7 @@ void gm20b_flush_ltc(struct gk20a *g)
         }
 }
 
-static int gm20b_determine_L2_size_bytes(struct gk20a *g)
+int gm20b_determine_L2_size_bytes(struct gk20a *g)
 {
         u32 lts_per_ltc;
         u32 ways;
@@ -438,7 +438,7 @@ void gm20b_ltc_init_cbc(struct gk20a *g, struct gr_gk20a *gr)
 }
 
 #ifdef CONFIG_DEBUG_FS
-static void gm20b_ltc_sync_debugfs(struct gk20a *g)
+void gm20b_ltc_sync_debugfs(struct gk20a *g)
 {
         u32 reg_f = ltc_ltcs_ltss_tstg_set_mgmt_2_l2_bypass_mode_enabled_f();
 
@@ -459,23 +459,3 @@ static void gm20b_ltc_sync_debugfs(struct gk20a *g)
         nvgpu_spinlock_release(&g->debugfs_lock);
 }
 #endif
-
-void gm20b_init_ltc(struct gpu_ops *gops)
-{
-        /* Gk20a reused ops. */
-        gops->ltc.determine_L2_size_bytes = gm20b_determine_L2_size_bytes;
-        gops->ltc.set_zbc_color_entry = gm20b_ltc_set_zbc_color_entry;
-        gops->ltc.set_zbc_depth_entry = gm20b_ltc_set_zbc_depth_entry;
-        gops->ltc.init_cbc = gm20b_ltc_init_cbc;
-
-        /* GM20b specific ops. */
-        gops->ltc.init_fs_state = gm20b_ltc_init_fs_state;
-        gops->ltc.init_comptags = gm20b_ltc_init_comptags;
-        gops->ltc.cbc_ctrl = gm20b_ltc_cbc_ctrl;
-        gops->ltc.isr = gm20b_ltc_isr;
-        gops->ltc.cbc_fix_config = gm20b_ltc_cbc_fix_config;
-        gops->ltc.flush = gm20b_flush_ltc;
-#ifdef CONFIG_DEBUG_FS
-        gops->ltc.sync_debugfs = gm20b_ltc_sync_debugfs;
-#endif
-}