gpu: nvgpu: Reorg clk HAL initialization

Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch only covers the clk
and clk_arb 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: I553353df836b187b8eac61e16b63080b570c96b8
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1511076
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 5 insertions, 14 deletions

diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index e9aec7ac..105f8bd5 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -47,12 +47,12 @@ static int clk_gp106_debugfs_init(struct gk20a *g);
 
 
 static u32 gp106_get_rate_cntr(struct gk20a *g, struct namemap_cfg *);
-static u32 gp106_crystal_clk_hz(struct gk20a *g)
+u32 gp106_crystal_clk_hz(struct gk20a *g)
 {
         return (XTAL4X_KHZ * 1000);
 }
 
-static unsigned long gp106_clk_measure_freq(struct gk20a *g, u32 api_domain)
+unsigned long gp106_clk_measure_freq(struct gk20a *g, u32 api_domain)
 {
         struct clk_gk20a *clk = &g->clk;
         u32 freq_khz;
@@ -76,7 +76,8 @@ static unsigned long gp106_clk_measure_freq(struct gk20a *g, u32 api_domain)
         return freq_khz * 1000UL;
 }
 
-static int gp106_init_clk_support(struct gk20a *g) {
+int gp106_init_clk_support(struct gk20a *g)
+{
         struct clk_gk20a *clk = &g->clk;
         u32 err = 0;
 
@@ -273,18 +274,8 @@ err_out:
 }
 #endif /* CONFIG_DEBUG_FS */
 
-static int gp106_suspend_clk_support(struct gk20a *g)
+int gp106_suspend_clk_support(struct gk20a *g)
 {
         nvgpu_mutex_destroy(&g->clk.clk_mutex);
         return 0;
 }
-
-void gp106_init_clk_ops(struct gpu_ops *gops) {
-        gops->clk.init_clk_support = gp106_init_clk_support;
-        gops->clk.get_crystal_clk_hz = gp106_crystal_clk_hz;
-        gops->clk.measure_freq = gp106_clk_measure_freq;
-        gops->clk.suspend_clk_support = gp106_suspend_clk_support;
-        gops->clk.mclk_init = gp106_mclk_init;
-        gops->clk.mclk_change = gp106_mclk_change;
-        gops->clk.mclk_deinit = gp106_mclk_deinit;
-}