diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ctxsw_trace.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c index 2f0c3e89..a335988a 100644 --- a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c +++ b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c | |||
@@ -702,7 +702,7 @@ void gk20a_ctxsw_trace_channel_reset(struct gk20a *g, struct channel_gk20a *ch) | |||
702 | if (!g->ctxsw_trace) | 702 | if (!g->ctxsw_trace) |
703 | return; | 703 | return; |
704 | 704 | ||
705 | g->ops.bus.read_ptimer(g, &entry.timestamp); | 705 | g->ops.ptimer.read_ptimer(g, &entry.timestamp); |
706 | gk20a_ctxsw_trace_write(g, &entry); | 706 | gk20a_ctxsw_trace_write(g, &entry); |
707 | gk20a_ctxsw_trace_wake_up(g, 0); | 707 | gk20a_ctxsw_trace_wake_up(g, 0); |
708 | #endif | 708 | #endif |
@@ -722,7 +722,7 @@ void gk20a_ctxsw_trace_tsg_reset(struct gk20a *g, struct tsg_gk20a *tsg) | |||
722 | if (!g->ctxsw_trace) | 722 | if (!g->ctxsw_trace) |
723 | return; | 723 | return; |
724 | 724 | ||
725 | g->ops.bus.read_ptimer(g, &entry.timestamp); | 725 | g->ops.ptimer.read_ptimer(g, &entry.timestamp); |
726 | gk20a_ctxsw_trace_write(g, &entry); | 726 | gk20a_ctxsw_trace_write(g, &entry); |
727 | gk20a_ctxsw_trace_wake_up(g, 0); | 727 | gk20a_ctxsw_trace_wake_up(g, 0); |
728 | #endif | 728 | #endif |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index ee0739c9..cda2ce46 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <nvgpu/bitops.h> | 24 | #include <nvgpu/bitops.h> |
25 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
26 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
27 | #include <nvgpu/bus.h> | 27 | #include <nvgpu/ptimer.h> |
28 | #include <nvgpu/vidmem.h> | 28 | #include <nvgpu/vidmem.h> |
29 | #include <nvgpu/log.h> | 29 | #include <nvgpu/log.h> |
30 | #include <nvgpu/enabled.h> | 30 | #include <nvgpu/enabled.h> |
@@ -811,7 +811,7 @@ static int nvgpu_gpu_get_cpu_time_correlation_info( | |||
811 | return -ENOMEM; | 811 | return -ENOMEM; |
812 | } | 812 | } |
813 | 813 | ||
814 | err = g->ops.bus.get_timestamps_zipper(g, | 814 | err = g->ops.ptimer.get_timestamps_zipper(g, |
815 | args->source_id, args->count, samples); | 815 | args->source_id, args->count, samples); |
816 | if (!err) { | 816 | if (!err) { |
817 | for (i = 0; i < args->count; i++) { | 817 | for (i = 0; i < args->count; i++) { |
@@ -836,7 +836,7 @@ static int nvgpu_gpu_get_gpu_time( | |||
836 | if (err) | 836 | if (err) |
837 | return err; | 837 | return err; |
838 | 838 | ||
839 | err = g->ops.bus.read_ptimer(g, &time); | 839 | err = g->ops.ptimer.read_ptimer(g, &time); |
840 | if (!err) | 840 | if (!err) |
841 | args->gpu_timestamp = time; | 841 | args->gpu_timestamp = time; |
842 | 842 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c index 90fbc079..0d224eb9 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/debug.h> | 29 | #include <nvgpu/debug.h> |
30 | #include <nvgpu/bus.h> | ||
31 | #include <nvgpu/soc.h> | 30 | #include <nvgpu/soc.h> |
32 | #include <nvgpu/ctxsw_trace.h> | 31 | #include <nvgpu/ctxsw_trace.h> |
33 | #include <nvgpu/defaults.h> | 32 | #include <nvgpu/defaults.h> |