diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c index 7fd1793c..12d7dcb9 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <nvgpu/circ_buf.h> | 32 | #include <nvgpu/circ_buf.h> |
33 | #include <nvgpu/thread.h> | 33 | #include <nvgpu/thread.h> |
34 | #include <nvgpu/barrier.h> | 34 | #include <nvgpu/barrier.h> |
35 | #include <nvgpu/mm.h> | ||
35 | 36 | ||
36 | #include "ctxsw_trace_gk20a.h" | 37 | #include "ctxsw_trace_gk20a.h" |
37 | #include "fecs_trace_gk20a.h" | 38 | #include "fecs_trace_gk20a.h" |
@@ -93,7 +94,7 @@ static inline u64 gk20a_fecs_trace_record_ts_timestamp_v(u64 ts) | |||
93 | 94 | ||
94 | static u32 gk20a_fecs_trace_fecs_context_ptr(struct gk20a *g, struct channel_gk20a *ch) | 95 | static u32 gk20a_fecs_trace_fecs_context_ptr(struct gk20a *g, struct channel_gk20a *ch) |
95 | { | 96 | { |
96 | return (u32) (gk20a_mm_inst_block_addr(g, &ch->inst_block) >> 12LL); | 97 | return (u32) (nvgpu_inst_block_addr(g, &ch->inst_block) >> 12LL); |
97 | } | 98 | } |
98 | 99 | ||
99 | static inline int gk20a_fecs_trace_num_ts(void) | 100 | static inline int gk20a_fecs_trace_num_ts(void) |
@@ -633,12 +634,12 @@ int gk20a_fecs_trace_bind_channel(struct gk20a *g, | |||
633 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_ctxsw, | 634 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_ctxsw, |
634 | "chid=%d context_ptr=%x inst_block=%llx", | 635 | "chid=%d context_ptr=%x inst_block=%llx", |
635 | ch->chid, context_ptr, | 636 | ch->chid, context_ptr, |
636 | gk20a_mm_inst_block_addr(g, &ch->inst_block)); | 637 | nvgpu_inst_block_addr(g, &ch->inst_block)); |
637 | 638 | ||
638 | if (!trace) | 639 | if (!trace) |
639 | return -ENOMEM; | 640 | return -ENOMEM; |
640 | 641 | ||
641 | pa = gk20a_mm_inst_block_addr(g, &trace->trace_buf); | 642 | pa = nvgpu_inst_block_addr(g, &trace->trace_buf); |
642 | if (!pa) | 643 | if (!pa) |
643 | return -ENOMEM; | 644 | return -ENOMEM; |
644 | aperture = nvgpu_aperture_mask(g, &trace->trace_buf, | 645 | aperture = nvgpu_aperture_mask(g, &trace->trace_buf, |