gpu: nvgpu: Rename clk->get_rate to measure_freq

get_rate is already used for call-back that queries the last set
clock rate. This instance of get_rate actually measures the frequency
so renaming it to measure_freq.

At the same time modify to use hertz instead of megahertz. We use
fractional megahertz already in GPU.

Change-Id: I387473d6a6cbf3bb9b9e5a909677a1a725403c32
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1300111
Reviewed-by: Alex Waterman <alexw@nvidia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c
index 3bf64d0b..44b442d8 100644
--- a/drivers/gpu/nvgpu/clk/clk_arb.c
+++ b/drivers/gpu/nvgpu/clk/clk_arb.c
@@ -1708,11 +1708,13 @@ int nvgpu_clk_arb_get_arbiter_effective_mhz(struct gk20a *g,
 {
         switch(api_domain) {
         case NVGPU_GPU_CLK_DOMAIN_MCLK:
-                *freq_mhz = g->ops.clk.get_rate(g, CTRL_CLK_DOMAIN_MCLK);
+                *freq_mhz = g->ops.clk.measure_freq(g, CTRL_CLK_DOMAIN_MCLK) /
+                        1000000ULL;
                 return 0;
 
         case NVGPU_GPU_CLK_DOMAIN_GPCCLK:
-                *freq_mhz = g->ops.clk.get_rate(g, CTRL_CLK_DOMAIN_GPC2CLK) / 2;
+                *freq_mhz = g->ops.clk.measure_freq(g, CTRL_CLK_DOMAIN_GPC2CLK) /
+                        2000000ULL;
                 return 0;
 
         default: