From 3058fb2b960cf1da53fd25c5c8d286d60560615e Mon Sep 17 00:00:00 2001 From: Alex Frid Date: Mon, 14 Jul 2014 17:01:31 -0700 Subject: gpu: nvgpu: Use 1kHz resolution for GPCPLL programming Used 1kHz resolution (instead of 1 MHz) for GPCPLL programming: limits specifications, calculating GPCPLL settings, storing target frequency values, and proving output from debug monitor. Updated comments in clock header to properly reflect frequency units. Bug 1450787 Change-Id: Ica58f794b82522288f2883c40626d82dbd794902 Signed-off-by: Alex Frid Reviewed-on: http://git-master/r/437943 Reviewed-by: Seshendra Gadagottu Tested-by: Seshendra Gadagottu GVS: Gerrit_Virtual_Submit Reviewed-by: Yu-Huan Hsu --- drivers/gpu/nvgpu/gk20a/clk_gk20a.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/clk_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h index d2665259..533e6d1e 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h @@ -31,18 +31,18 @@ enum { struct pll { u32 id; - u32 clk_in; /* MHz */ + u32 clk_in; /* KHz */ u32 M; u32 N; u32 PL; - u32 freq; /* MHz */ + u32 freq; /* KHz */ bool enabled; }; struct pll_parms { - u32 min_freq, max_freq; /* MHz */ - u32 min_vco, max_vco; /* MHz */ - u32 min_u, max_u; /* MHz */ + u32 min_freq, max_freq; /* KHz */ + u32 min_vco, max_vco; /* KHz */ + u32 min_u, max_u; /* KHz */ u32 min_M, max_M; u32 min_N, max_N; u32 min_PL, max_PL; @@ -60,7 +60,7 @@ struct clk_gk20a { struct gpufreq_table_data { unsigned int index; - unsigned int frequency; /* MHz */ + unsigned int frequency; /* Hz */ }; struct gpufreq_table_data *tegra_gpufreq_table_get(void); @@ -82,13 +82,13 @@ extern struct pll_parms gpc_pll_params; static inline unsigned long rate_gpc2clk_to_gpu(unsigned long rate) { - /* convert the MHz gpc2clk frequency to Hz gpcpll frequency */ - return (rate * MHZ) / 2; + /* convert the kHz gpc2clk frequency to Hz gpcpll frequency */ + return (rate * KHZ) / 2; } static inline unsigned long rate_gpu_to_gpc2clk(unsigned long rate) { - /* convert the Hz gpcpll frequency to MHz gpc2clk frequency */ - return (rate * 2) / MHZ; + /* convert the Hz gpcpll frequency to kHz gpc2clk frequency */ + return (rate * 2) / KHZ; } #endif /* _NVHOST_CLK_GK20A_H_ */ -- cgit v1.2.2