2 files changed, 10 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 1a9c6a74..33e69d4e 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -24,6 +24,7 @@
 
 #include "common/bus/bus_gk20a.h"
 #include "common/clock_gating/gp106_gating_reglist.h"
+#include "common/ptimer/ptimer_gk20a.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -86,7 +87,7 @@
 
 #include <nvgpu/debug.h>
 #include <nvgpu/bug.h>
-#include <nvgpu/bus.h>
+#include <nvgpu/ptimer.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/error_notifier.h>
@@ -720,11 +721,14 @@ static const struct gpu_ops gp106_ops = {
         .bus = {
                 .init_hw = gk20a_bus_init_hw,
                 .isr = gk20a_bus_isr,
-                .read_ptimer = gk20a_read_ptimer,
-                .get_timestamps_zipper = nvgpu_get_timestamps_zipper,
                 .bar1_bind = gk20a_bus_bar1_bind,
                 .set_bar0_window = gk20a_bus_set_bar0_window,
         },
+        .ptimer = {
+                .isr = gk20a_ptimer_isr,
+                .read_ptimer = gk20a_read_ptimer,
+                .get_timestamps_zipper = nvgpu_get_timestamps_zipper,
+        },
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         .css = {
                 .enable_snapshot = css_hw_enable_snapshot,
@@ -806,6 +810,7 @@ int gp106_init_hal(struct gk20a *g)
         gops->debugger = gp106_ops.debugger;
         gops->dbg_session_ops = gp106_ops.dbg_session_ops;
         gops->bus = gp106_ops.bus;
+        gops->ptimer = gp106_ops.ptimer;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gops->css = gp106_ops.css;
 #endif
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
index bfb66e6e..074aec92 100644
--- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
@@ -3353,7 +3353,7 @@ int gp106_mclk_change(struct gk20a *g, u16 val)
         pseq_cmd->cmd_type = NV_PMU_SEQ_CMD_ID_RUN_SCRIPT;
 
 #ifdef CONFIG_DEBUG_FS
-        g->ops.bus.read_ptimer(g, &t0);
+        g->ops.ptimer.read_ptimer(g, &t0);
 #endif
 
         if (speed == GP106_MCLK_HIGH_SPEED) {
@@ -3402,7 +3402,7 @@ int gp106_mclk_change(struct gk20a *g, u16 val)
         mclk->speed = speed;
 
 #ifdef CONFIG_DEBUG_FS
-        g->ops.bus.read_ptimer(g, &t1);
+        g->ops.ptimer.read_ptimer(g, &t1);
 
         nvgpu_mutex_acquire(&mclk->data_lock);
         mclk->switch_num++;