nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Add poweron voltage to clock structure

Browse Source 
Added GPCPLL poweron voltage field to GPU clock structure. Initialized
it differently for GPCPLL revisions B1 and C1.

Bug 1924194

Change-Id: Ide7a08445afd3ab9aea21f75871b750f45c02c99
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/1481263
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Bo Yan <byan@nvidia.com>
This commit is contained in:
Alex Frid
2017-05-12 21:28:00 -07:00
committed by mobile promotions
parent 2c822a6388
commit 4d7711b076
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/nvgpu/gk20a/clk_gk20a.h
View File

@@ -96,6 +96,7 @@ struct clk_gk20a {
bool sw_ready; bool sw_ready;
bool clk_hw_on; bool clk_hw_on;
bool debugfs_set; bool debugfs_set;
int pll_poweron_uv;
}; };
#if defined(CONFIG_COMMON_CLK) #if defined(CONFIG_COMMON_CLK)

16
drivers/gpu/nvgpu/gm20b/clk_gm20b.c
View File

@@ -48,7 +48,8 @@
#define DFS_EXT_CAL_EN BIT(9) #define DFS_EXT_CAL_EN BIT(9)
#define DFS_EXT_STROBE BIT(16) #define DFS_EXT_STROBE BIT(16)
#define BOOT_GPU_UV 1000000 /* gpu rail boot voltage 1.0V */ #define BOOT_GPU_UV_B1 1000000 /* gpu rail boot voltage 1.0V */
#define BOOT_GPU_UV_C1 800000 /* gpu rail boot voltage 0.8V */
#define ADC_SLOPE_UV 10000 /* default ADC detection slope 10mV */ #define ADC_SLOPE_UV 10000 /* default ADC detection slope 10mV */
#define DVFS_SAFE_MARGIN 10 /* 10% */ #define DVFS_SAFE_MARGIN 10 /* 10% */
@@ -558,7 +559,7 @@ static int clk_enbale_pll_dvfs(struct gk20a *g)
data = gk20a_readl(g, trim_sys_gpcpll_cfg3_r()); data = gk20a_readl(g, trim_sys_gpcpll_cfg3_r());
data = trim_sys_gpcpll_cfg3_dfs_testout_v(data); data = trim_sys_gpcpll_cfg3_dfs_testout_v(data);
p->uvdet_offs = BOOT_GPU_UV - data * ADC_SLOPE_UV; p->uvdet_offs = g->clk.pll_poweron_uv - data * ADC_SLOPE_UV;
p->uvdet_slope = ADC_SLOPE_UV; p->uvdet_slope = ADC_SLOPE_UV;
return 0; return 0;
} }
@@ -1154,8 +1155,15 @@ static int gm20b_init_clk_setup_sw(struct gk20a *g)
return 0; return 0;
} }
gpc_pll_params = (clk->gpc_pll.id == GM20B_GPC_PLL_C1) ? if (clk->gpc_pll.id == GM20B_GPC_PLL_C1) {
gpc_pll_params_c1 : gpc_pll_params_b1; gpc_pll_params = gpc_pll_params_c1;
if (!clk->pll_poweron_uv)
clk->pll_poweron_uv = BOOT_GPU_UV_C1;
} else {
gpc_pll_params = gpc_pll_params_b1;
if (!clk->pll_poweron_uv)
clk->pll_poweron_uv = BOOT_GPU_UV_B1;
}
if (!gk20a_clk_get(g)) { if (!gk20a_clk_get(g)) {
err = -EINVAL; err = -EINVAL;