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/ctxsw_trace.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/ctxsw_trace.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ctxsw_trace.c | 4 |
1 files changed, 2 insertions, 2 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 |