gpu: nvgpu: move mclk related functions to clk

Move mclk related functions be moved to clk structure instead of
pmu. We want to keep pmu only for basic pmu interaction and
split clk, lpwr etc.

Bug 1921094

Change-Id: I32394bc0e6d3657dfbd34dbcf19c9af56c12e194
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master/r/1506586
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index 4d865664..08639e0b 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -30,6 +30,8 @@
 #include "clk_gp106.h"
 #include "clk/clk_arb.h"
 
+#include "gp106/pmu_mclk_gp106.h"
+
 #include <nvgpu/hw/gp106/hw_trim_gp106.h>
 
 #define gk20a_dbg_clk(fmt, arg...) \
@@ -281,4 +283,7 @@ void gp106_init_clk_ops(struct gpu_ops *gops) {
         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;
 }
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
index 632023ba..eec89695 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
@@ -20,7 +20,6 @@
 #include "gm20b/pmu_gm20b.h"
 #include "gp10b/pmu_gp10b.h"
 #include "gp106/pmu_gp106.h"
-#include "gp106/pmu_mclk_gp106.h"
 #include "gp106/acr_gp106.h"
 
 #include "clk/clk_mclk.h"
@@ -331,9 +330,6 @@ void gp106_init_pmu_ops(struct gpu_ops *gops)
         gops->pmu.pmu_lpwr_disable_pg = nvgpu_lpwr_disable_pg;
         gops->pmu.pmu_pg_param_post_init = nvgpu_lpwr_post_init;
         gops->pmu.dump_secure_fuses = NULL;
-        gops->pmu.mclk_init = gp106_mclk_init;
-        gops->pmu.mclk_change = gp106_mclk_change;
-        gops->pmu.mclk_deinit = gp106_mclk_deinit;
         gops->pmu.is_pmu_supported = gp106_is_pmu_supported;
         gops->pmu.reset_engine = gp106_pmu_engine_reset;
         gops->pmu.is_engine_in_reset = gp106_pmu_is_engine_in_reset;
diff --git a/drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.c
index b8dd3eac..c0e4269f 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.c
@@ -3276,7 +3276,6 @@ int gp106_mclk_init(struct gk20a *g)
                         mclk->debugfs_set = true;
         }
 #endif
-        g->ops.pmu.mclk_change = gp106_mclk_change;
 
         mclk->init = true;
 
@@ -3437,8 +3436,8 @@ static int mclk_debug_speed_set(void *data, u64 val)
         /* This is problematic because it can interrupt the arbiter
          * and send it to sleep. we need to consider removing this
          */
-        if (g->ops.pmu.mclk_change)
-                return g->ops.pmu.mclk_change(g, (u16) val);
+        if (g->ops.clk.mclk_change)
+                return g->ops.clk.mclk_change(g, (u16) val);
         return 0;
 
 }