diff options
Diffstat (limited to 'drivers/gpu/nvgpu/perf/vfe_var.c')
-rw-r--r-- | drivers/gpu/nvgpu/perf/vfe_var.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/perf/vfe_var.c b/drivers/gpu/nvgpu/perf/vfe_var.c index d1e1d76c..7170f502 100644 --- a/drivers/gpu/nvgpu/perf/vfe_var.c +++ b/drivers/gpu/nvgpu/perf/vfe_var.c | |||
@@ -11,13 +11,13 @@ | |||
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 "perf.h" | 17 | #include "perf.h" |
16 | #include "vfe_var.h" | 18 | #include "vfe_var.h" |
17 | #include "include/bios.h" | ||
18 | #include "boardobj/boardobjgrp.h" | 19 | #include "boardobj/boardobjgrp.h" |
19 | #include "boardobj/boardobjgrp_e32.h" | 20 | #include "boardobj/boardobjgrp_e32.h" |
20 | #include "gm206/bios_gm206.h" | ||
21 | #include "ctrl/ctrlclk.h" | 21 | #include "ctrl/ctrlclk.h" |
22 | #include "ctrl/ctrlvolt.h" | 22 | #include "ctrl/ctrlvolt.h" |
23 | #include "gk20a/pmu_gk20a.h" | 23 | #include "gk20a/pmu_gk20a.h" |
@@ -179,17 +179,14 @@ u32 dev_init_get_vfield_info(struct gk20a *g, | |||
179 | u8 *psegmentcount = NULL; | 179 | u8 *psegmentcount = NULL; |
180 | u32 status = 0; | 180 | u32 status = 0; |
181 | 181 | ||
182 | if (!g->ops.bios.get_perf_table_ptrs) | 182 | vfieldregtableptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, |
183 | return -EINVAL; | ||
184 | |||
185 | vfieldregtableptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g, | ||
186 | g->bios.virt_token, VP_FIELD_REGISTER); | 183 | g->bios.virt_token, VP_FIELD_REGISTER); |
187 | if (vfieldregtableptr == NULL) { | 184 | if (vfieldregtableptr == NULL) { |
188 | status = -EINVAL; | 185 | status = -EINVAL; |
189 | goto done; | 186 | goto done; |
190 | } | 187 | } |
191 | 188 | ||
192 | vfieldtableptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g, | 189 | vfieldtableptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, |
193 | g->bios.virt_token, VP_FIELD_TABLE); | 190 | g->bios.virt_token, VP_FIELD_TABLE); |
194 | if (vfieldtableptr == NULL) { | 191 | if (vfieldtableptr == NULL) { |
195 | status = -EINVAL; | 192 | status = -EINVAL; |
@@ -864,12 +861,7 @@ static u32 devinit_get_vfe_var_table(struct gk20a *g, | |||
864 | 861 | ||
865 | gk20a_dbg_info(""); | 862 | gk20a_dbg_info(""); |
866 | 863 | ||
867 | if (!g->ops.bios.get_perf_table_ptrs) { | 864 | vfevars_tbl_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, |
868 | status = -EINVAL; | ||
869 | goto done; | ||
870 | } | ||
871 | |||
872 | vfevars_tbl_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g, | ||
873 | g->bios.perf_token, | 865 | g->bios.perf_token, |
874 | CONTINUOUS_VIRTUAL_BINNING_TABLE); | 866 | CONTINUOUS_VIRTUAL_BINNING_TABLE); |
875 | if (vfevars_tbl_ptr == NULL) { | 867 | if (vfevars_tbl_ptr == NULL) { |