summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-12-20 17:11:54 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-01-04 04:44:25 -0500
commitf37f4e27e362629d5c187817104d48d703c380cc (patch)
tree8dddaa1d926016848c6cebc4aa9f4a3612341da1 /drivers/gpu/nvgpu/pmgr/pwrpolicy.c
parent2a95a288b285b0eff16a8825298c416d185693fb (diff)
gpu: nvgpu: Use perf table only VBIOS supports it
We retrieve perf table from VBIOS only if respective HAL op is implemented. Later in code we unconditionally dereference the pointer which can lead to NULL pointer access. Fix by early aborting creation of devinit tables if the perf VBIOS getter is missing. Change-Id: If48aa6dac724056dd1feb2ef520e343736d4db85 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1279223 GVS: Gerrit_Virtual_Submit Reviewed-by: Thomas Fleury <tfleury@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/pmgr/pwrpolicy.c')
-rw-r--r--drivers/gpu/nvgpu/pmgr/pwrpolicy.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
index d7926773..cce3bd5e 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
@@ -466,13 +466,14 @@ static u32 devinit_get_pwr_policy_table(struct gk20a *g,
466 466
467 gk20a_dbg_info(""); 467 gk20a_dbg_info("");
468 468
469 if (g->ops.bios.get_perf_table_ptrs != NULL) { 469 if (!g->ops.bios.get_perf_table_ptrs)
470 pwr_policy_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g, 470 return -EINVAL;
471 g->bios.perf_token, POWER_CAPPING_TABLE); 471
472 if (pwr_policy_table_ptr == NULL) { 472 pwr_policy_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
473 status = -EINVAL; 473 g->bios.perf_token, POWER_CAPPING_TABLE);
474 goto done; 474 if (pwr_policy_table_ptr == NULL) {
475 } 475 status = -EINVAL;
476 goto done;
476 } 477 }
477 478
478 memcpy(&pwr_policy_table_header.version, 479 memcpy(&pwr_policy_table_header.version,