diff options
author | Alex Frid <afrid@nvidia.com> | 2014-11-08 00:13:55 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:12:09 -0400 |
commit | 6275bbb33bb0f72cc03c7e68d8186b36c96ee854 (patch) | |
tree | c7868de1cbddec0c669922764acb8a693e9e85ae /drivers | |
parent | a612dc0dbd1a59632d119151c622a632e4edcee3 (diff) |
gpu: nvgpu: Add GPCPLL DVFS state to debug prints
Bug 1555318
Change-Id: I80655e047963619b5a3d7e9155db13c9396417fe
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/598970
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index 79a3ddc5..759f9f2a 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c | |||
@@ -919,8 +919,9 @@ static void clk_config_pll_safe_dvfs(struct gk20a *g, struct pll *gpll) | |||
919 | gpll->N = nsafe; | 919 | gpll->N = nsafe; |
920 | clk_config_dvfs_ndiv(gpll->dvfs.mv, gpll->N, &gpll->dvfs); | 920 | clk_config_dvfs_ndiv(gpll->dvfs.mv, gpll->N, &gpll->dvfs); |
921 | 921 | ||
922 | gk20a_dbg_clk("safe freq %d kHz, M %d, N %d, PL %d(div%d)", | 922 | gk20a_dbg_clk("safe freq %d kHz, M %d, N %d, PL %d(div%d), mV(cal) %d(%d), DC %d", |
923 | gpll->freq, gpll->M, gpll->N, gpll->PL, pl_to_div(gpll->PL)); | 923 | gpll->freq, gpll->M, gpll->N, gpll->PL, pl_to_div(gpll->PL), |
924 | gpll->dvfs.mv, gpll->dvfs.uv_cal / 1000, gpll->dvfs.dfs_coeff); | ||
924 | } | 925 | } |
925 | 926 | ||
926 | /* Change GPCPLL frequency and DVFS detection settings in DVFS mode */ | 927 | /* Change GPCPLL frequency and DVFS detection settings in DVFS mode */ |
@@ -993,6 +994,12 @@ static int clk_program_na_gpc_pll(struct gk20a *g, struct pll *gpll_new, | |||
993 | clk_set_dfs_ext_cal(g, gpll_new->dvfs.dfs_ext_cal); | 994 | clk_set_dfs_ext_cal(g, gpll_new->dvfs.dfs_ext_cal); |
994 | clk_set_dfs_coeff(g, gpll_new->dvfs.dfs_coeff); | 995 | clk_set_dfs_coeff(g, gpll_new->dvfs.dfs_coeff); |
995 | 996 | ||
997 | gk20a_dbg_clk("config_pll %d kHz, M %d, N %d, PL %d(div%d), mV(cal) %d(%d), DC %d", | ||
998 | gpll_new->freq, gpll_new->M, gpll_new->N, gpll_new->PL, | ||
999 | pl_to_div(gpll_new->PL), | ||
1000 | max(gpll_new->dvfs.mv, gpll_old->dvfs.mv), | ||
1001 | gpll_new->dvfs.uv_cal / 1000, gpll_new->dvfs.dfs_coeff); | ||
1002 | |||
996 | /* Finally set target rate (with DVFS detection settings already new) */ | 1003 | /* Finally set target rate (with DVFS detection settings already new) */ |
997 | return clk_program_gpc_pll(g, gpll_new, 1); | 1004 | return clk_program_gpc_pll(g, gpll_new, 1); |
998 | } | 1005 | } |