diff options
Diffstat (limited to 'drivers/gpu/nvgpu/volt/volt_dev.c')
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_dev.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c index ebc140ef..4807f023 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.c +++ b/drivers/gpu/nvgpu/volt/volt_dev.c | |||
@@ -14,17 +14,17 @@ | |||
14 | #include <linux/sort.h> | 14 | #include <linux/sort.h> |
15 | 15 | ||
16 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
17 | #include "include/bios.h" | ||
18 | #include "boardobj/boardobjgrp.h" | 17 | #include "boardobj/boardobjgrp.h" |
19 | #include "boardobj/boardobjgrp_e32.h" | 18 | #include "boardobj/boardobjgrp_e32.h" |
20 | #include "gm206/bios_gm206.h" | 19 | #include "gm206/bios_gm206.h" |
21 | #include "ctrl/ctrlvolt.h" | 20 | #include "ctrl/ctrlvolt.h" |
22 | #include "gk20a/pmu_gk20a.h" | 21 | #include "gk20a/pmu_gk20a.h" |
23 | 22 | ||
24 | #include "include/bios.h" | ||
25 | #include "volt.h" | 23 | #include "volt.h" |
26 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
27 | 25 | ||
26 | #include <nvgpu/bios.h> | ||
27 | |||
28 | #define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0 | 28 | #define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0 |
29 | #define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1 | 29 | #define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1 |
30 | 30 | ||
@@ -363,14 +363,9 @@ static u32 volt_get_volt_devices_table(struct gk20a *g, | |||
363 | u8 entry_idx; | 363 | u8 entry_idx; |
364 | u8 *entry_offset; | 364 | u8 *entry_offset; |
365 | 365 | ||
366 | if (g->ops.bios.get_perf_table_ptrs) { | 366 | volt_device_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, |
367 | volt_device_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g, | 367 | g->bios.perf_token, VOLTAGE_DEVICE_TABLE); |
368 | g->bios.perf_token, VOLTAGE_DEVICE_TABLE); | 368 | if (volt_device_table_ptr == NULL) { |
369 | if (volt_device_table_ptr == NULL) { | ||
370 | status = -EINVAL; | ||
371 | goto done; | ||
372 | } | ||
373 | } else { | ||
374 | status = -EINVAL; | 369 | status = -EINVAL; |
375 | goto done; | 370 | goto done; |
376 | } | 371 | } |