diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-05-24 18:25:41 -0400 |
---|---|---|
committer | Tejal Kudav <tkudav@nvidia.com> | 2018-06-14 09:44:07 -0400 |
commit | d71d38087ded679f60714dae3a859523a19df04f (patch) | |
tree | 61439d294705ef91ce08ae4c02d4921eec943283 /drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | |
parent | 5215d65c25b5e76c19d9d12b03c52f69e2d40227 (diff) |
gpu: nvgpu: Separate timer from bus
Code touching timer registers was combined with bus code. They're two
logically separate register spaces, so separate the code accordingly.
JIRA NVGPU-588
Change-Id: I40e2925ff156669f41ddc1f2e7714f92a2da367b
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1730893
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | ||