4 files changed, 9 insertions, 16 deletions

diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
index 53241734..28fe943e 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
+++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
@@ -13,7 +13,6 @@
 
 #include "gk20a/gk20a.h"
 #include "pwrdev.h"
-#include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c
index e831126b..0f87ad26 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrdev.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c
@@ -11,9 +11,10 @@
  * more details.
  */
 
+#include <nvgpu/bios.h>
+
 #include "gk20a/gk20a.h"
 #include "pwrdev.h"
-#include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include "gm206/bios_gm206.h"
@@ -138,10 +139,7 @@ static u32 devinit_get_pwr_device_table(struct gk20a *g,
 
         gk20a_dbg_info("");
 
-        if (!g->ops.bios.get_perf_table_ptrs)
-                return -EINVAL;
-
-        pwr_device_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+        pwr_device_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g,
                         g->bios.perf_token, POWER_SENSORS_TABLE);
         if (pwr_device_table_ptr == NULL) {
                 status = -EINVAL;
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
index ab2460eb..685aa71a 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
@@ -11,9 +11,10 @@
  * more details.
  */
 
+#include <nvgpu/bios.h>
+
 #include "gk20a/gk20a.h"
 #include "pwrdev.h"
-#include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include "gm206/bios_gm206.h"
@@ -185,10 +186,7 @@ static u32 devinit_get_pwr_topology_table(struct gk20a *g,
 
         gk20a_dbg_info("");
 
-        if (!g->ops.bios.get_perf_table_ptrs)
-                return -EINVAL;
-
-        pwr_topology_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+        pwr_topology_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g,
                         g->bios.perf_token, POWER_TOPOLOGY_TABLE);
         if (pwr_topology_table_ptr == NULL) {
                 status = -EINVAL;
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
index d19f9a1c..4c007337 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
@@ -11,9 +11,10 @@
  * more details.
  */
 
+#include <nvgpu/bios.h>
+
 #include "gk20a/gk20a.h"
 #include "pwrpolicy.h"
-#include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include "gm206/bios_gm206.h"
@@ -521,10 +522,7 @@ static u32 devinit_get_pwr_policy_table(struct gk20a *g,
 
         gk20a_dbg_info("");
 
-        if (!g->ops.bios.get_perf_table_ptrs)
-                return -EINVAL;
-
-        ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
+        ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g,
                         g->bios.perf_token, POWER_CAPPING_TABLE);
         if (ptr == NULL) {
                 status = -EINVAL;