diff options
Diffstat (limited to 'drivers/gpu/nvgpu/volt/volt_rail.c')
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_rail.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/volt/volt_rail.c index 6d606228..aaad86a5 100644 --- a/drivers/gpu/nvgpu/volt/volt_rail.c +++ b/drivers/gpu/nvgpu/volt/volt_rail.c | |||
@@ -11,16 +11,15 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <nvgpu/bios.h> | ||
15 | |||
14 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
15 | #include "include/bios.h" | ||
16 | #include "boardobj/boardobjgrp.h" | 17 | #include "boardobj/boardobjgrp.h" |
17 | #include "boardobj/boardobjgrp_e32.h" | 18 | #include "boardobj/boardobjgrp_e32.h" |
18 | #include "gm206/bios_gm206.h" | 19 | #include "gm206/bios_gm206.h" |
19 | #include "ctrl/ctrlvolt.h" | 20 | #include "ctrl/ctrlvolt.h" |
20 | #include "gk20a/pmu_gk20a.h" | 21 | #include "gk20a/pmu_gk20a.h" |
21 | 22 | ||
22 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
23 | #include "include/bios.h" | ||
24 | #include "volt.h" | 23 | #include "volt.h" |
25 | 24 | ||
26 | u8 volt_rail_volt_domain_convert_to_idx(struct gk20a *g, u8 volt_domain) | 25 | u8 volt_rail_volt_domain_convert_to_idx(struct gk20a *g, u8 volt_domain) |
@@ -241,14 +240,9 @@ static u32 volt_get_volt_rail_table(struct gk20a *g, | |||
241 | struct voltage_rail volt_rail; | 240 | struct voltage_rail volt_rail; |
242 | } rail_type_data; | 241 | } rail_type_data; |
243 | 242 | ||
244 | if (g->ops.bios.get_perf_table_ptrs) { | 243 | volt_rail_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, |
245 | volt_rail_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g, | 244 | g->bios.perf_token, VOLTAGE_RAIL_TABLE); |
246 | g->bios.perf_token, VOLTAGE_RAIL_TABLE); | 245 | if (volt_rail_table_ptr == NULL) { |
247 | if (volt_rail_table_ptr == NULL) { | ||
248 | status = -EINVAL; | ||
249 | goto done; | ||
250 | } | ||
251 | } else { | ||
252 | status = -EINVAL; | 246 | status = -EINVAL; |
253 | goto done; | 247 | goto done; |
254 | } | 248 | } |