diff options
Diffstat (limited to 'drivers/gpu/nvgpu/pmgr/pwrpolicy.c')
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrpolicy.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c index 38575f74..13a94e4f 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c | |||
@@ -182,7 +182,7 @@ static u32 _pwr_policy_limitarboutputget(struct gk20a *g, | |||
182 | return _pwr_policy_limitarboutputget_helper(p_limit_arb); | 182 | return _pwr_policy_limitarboutputget_helper(p_limit_arb); |
183 | } | 183 | } |
184 | 184 | ||
185 | static u32 _pwr_domains_pmudatainit_hw_threshold(struct gk20a *g, | 185 | static int _pwr_domains_pmudatainit_hw_threshold(struct gk20a *g, |
186 | struct boardobj *board_obj_ptr, | 186 | struct boardobj *board_obj_ptr, |
187 | struct nv_pmu_boardobj *ppmudata) | 187 | struct nv_pmu_boardobj *ppmudata) |
188 | { | 188 | { |
@@ -190,7 +190,7 @@ static u32 _pwr_domains_pmudatainit_hw_threshold(struct gk20a *g, | |||
190 | struct pwr_policy_hw_threshold *p_hw_threshold; | 190 | struct pwr_policy_hw_threshold *p_hw_threshold; |
191 | struct pwr_policy *p_pwr_policy; | 191 | struct pwr_policy *p_pwr_policy; |
192 | struct nv_pmu_pmgr_pwr_policy *pmu_pwr_policy; | 192 | struct nv_pmu_pmgr_pwr_policy *pmu_pwr_policy; |
193 | u32 status = 0; | 193 | int status = 0; |
194 | 194 | ||
195 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); | 195 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); |
196 | if (status) { | 196 | if (status) { |
@@ -256,7 +256,7 @@ static struct boardobj *construct_pwr_policy(struct gk20a *g, | |||
256 | void *pargs, u16 pargs_size, u8 type) | 256 | void *pargs, u16 pargs_size, u8 type) |
257 | { | 257 | { |
258 | struct boardobj *board_obj_ptr = NULL; | 258 | struct boardobj *board_obj_ptr = NULL; |
259 | u32 status; | 259 | int status; |
260 | struct pwr_policy_hw_threshold *pwrpolicyhwthreshold; | 260 | struct pwr_policy_hw_threshold *pwrpolicyhwthreshold; |
261 | struct pwr_policy *pwrpolicy; | 261 | struct pwr_policy *pwrpolicy; |
262 | struct pwr_policy *pwrpolicyparams = (struct pwr_policy*)pargs; | 262 | struct pwr_policy *pwrpolicyparams = (struct pwr_policy*)pargs; |
@@ -363,13 +363,13 @@ static struct boardobj *construct_pwr_policy(struct gk20a *g, | |||
363 | return board_obj_ptr; | 363 | return board_obj_ptr; |
364 | } | 364 | } |
365 | 365 | ||
366 | static u32 _pwr_policy_construct_WAR_SW_Threshold_policy(struct gk20a *g, | 366 | static int _pwr_policy_construct_WAR_SW_Threshold_policy(struct gk20a *g, |
367 | struct pmgr_pwr_policy *ppwrpolicyobjs, | 367 | struct pmgr_pwr_policy *ppwrpolicyobjs, |
368 | union pwr_policy_data_union *ppwrpolicydata, | 368 | union pwr_policy_data_union *ppwrpolicydata, |
369 | u16 pwr_policy_size, | 369 | u16 pwr_policy_size, |
370 | u32 obj_index) | 370 | u32 obj_index) |
371 | { | 371 | { |
372 | u32 status = 0; | 372 | int status = 0; |
373 | struct boardobj *boardobj; | 373 | struct boardobj *boardobj; |
374 | 374 | ||
375 | /* WARN policy */ | 375 | /* WARN policy */ |
@@ -512,10 +512,10 @@ static inline void devinit_unpack_pwr_policy_entry( | |||
512 | __UNPACK_FIELD(unpacked, packed, filter_param); | 512 | __UNPACK_FIELD(unpacked, packed, filter_param); |
513 | } | 513 | } |
514 | 514 | ||
515 | static u32 devinit_get_pwr_policy_table(struct gk20a *g, | 515 | static int devinit_get_pwr_policy_table(struct gk20a *g, |
516 | struct pmgr_pwr_policy *ppwrpolicyobjs) | 516 | struct pmgr_pwr_policy *ppwrpolicyobjs) |
517 | { | 517 | { |
518 | u32 status = 0; | 518 | int status = 0; |
519 | u8 *ptr = NULL; | 519 | u8 *ptr = NULL; |
520 | struct boardobj *boardobj; | 520 | struct boardobj *boardobj; |
521 | struct pwr_policy_3x_header_struct *packed_hdr; | 521 | struct pwr_policy_3x_header_struct *packed_hdr; |
@@ -707,9 +707,9 @@ done: | |||
707 | return status; | 707 | return status; |
708 | } | 708 | } |
709 | 709 | ||
710 | u32 pmgr_policy_sw_setup(struct gk20a *g) | 710 | int pmgr_policy_sw_setup(struct gk20a *g) |
711 | { | 711 | { |
712 | u32 status; | 712 | int status; |
713 | struct boardobjgrp *pboardobjgrp = NULL; | 713 | struct boardobjgrp *pboardobjgrp = NULL; |
714 | struct pwr_policy *ppolicy; | 714 | struct pwr_policy *ppolicy; |
715 | struct pmgr_pwr_policy *ppwrpolicyobjs; | 715 | struct pmgr_pwr_policy *ppwrpolicyobjs; |