diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-03-31 16:33:02 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-04-13 16:12:41 -0400 |
commit | 9b5427da37161c350d28a821652f2bb84bca360f (patch) | |
tree | 989e7b649b7b5e54d1d316b245b61c1881a15de6 /drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | |
parent | 2adf9164d9d68cc3ab700af84724034682f44ab8 (diff) |
gpu: nvgpu: Support GPUs with no physical mode
Support GPUs which cannot choose between SMMU and physical
addressing.
Change-Id: If3256fa1bc795a84d039ad3aa63ebdccf5cc0afb
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1120469
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c index 58d8fda1..f9cddc41 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | |||
@@ -624,12 +624,13 @@ static int gk20a_fecs_trace_bind_channel(struct gk20a *g, | |||
624 | 624 | ||
625 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_ctxsw, | 625 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_ctxsw, |
626 | "hw_chid=%d context_ptr=%x inst_block=%llx", | 626 | "hw_chid=%d context_ptr=%x inst_block=%llx", |
627 | ch->hw_chid, context_ptr, gk20a_mem_phys(&ch->inst_block)); | 627 | ch->hw_chid, context_ptr, |
628 | gk20a_mm_inst_block_addr(g, &ch->inst_block)); | ||
628 | 629 | ||
629 | if (!trace) | 630 | if (!trace) |
630 | return -ENOMEM; | 631 | return -ENOMEM; |
631 | 632 | ||
632 | pa = gk20a_mem_phys(&trace->trace_buf); | 633 | pa = gk20a_mm_inst_block_addr(g, &trace->trace_buf); |
633 | if (!pa) | 634 | if (!pa) |
634 | return -ENOMEM; | 635 | return -ENOMEM; |
635 | 636 | ||