diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index abd455d7..47e7d82e 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -3439,7 +3439,7 @@ void gk20a_dump_channel_status_ramfc(struct gk20a *g, | |||
3439 | gk20a_debug_output(o, "SEMA STATE: value: 0x%08x " | 3439 | gk20a_debug_output(o, "SEMA STATE: value: 0x%08x " |
3440 | "next_val: 0x%08x addr: 0x%010llx\n", | 3440 | "next_val: 0x%08x addr: 0x%010llx\n", |
3441 | __nvgpu_semaphore_read(hw_sema), | 3441 | __nvgpu_semaphore_read(hw_sema), |
3442 | atomic_read(&hw_sema->next_value), | 3442 | nvgpu_atomic_read(&hw_sema->next_value), |
3443 | nvgpu_hw_sema_addr(hw_sema)); | 3443 | nvgpu_hw_sema_addr(hw_sema)); |
3444 | 3444 | ||
3445 | #ifdef CONFIG_TEGRA_GK20A_NVHOST | 3445 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
@@ -3489,7 +3489,7 @@ void gk20a_debug_dump_all_channel_status_ramfc(struct gk20a *g, | |||
3489 | continue; | 3489 | continue; |
3490 | 3490 | ||
3491 | ch_state[chid]->pid = ch->pid; | 3491 | ch_state[chid]->pid = ch->pid; |
3492 | ch_state[chid]->refs = atomic_read(&ch->ref_count); | 3492 | ch_state[chid]->refs = nvgpu_atomic_read(&ch->ref_count); |
3493 | ch_state[chid]->deterministic = ch->deterministic; | 3493 | ch_state[chid]->deterministic = ch->deterministic; |
3494 | nvgpu_mem_rd_n(g, &ch->inst_block, 0, | 3494 | nvgpu_mem_rd_n(g, &ch->inst_block, 0, |
3495 | &ch_state[chid]->inst_block[0], | 3495 | &ch_state[chid]->inst_block[0], |
@@ -3591,7 +3591,7 @@ void gk20a_fifo_channel_unbind(struct channel_gk20a *ch_gk20a) | |||
3591 | 3591 | ||
3592 | gk20a_dbg_fn(""); | 3592 | gk20a_dbg_fn(""); |
3593 | 3593 | ||
3594 | if (atomic_cmpxchg(&ch_gk20a->bound, true, false)) { | 3594 | if (nvgpu_atomic_cmpxchg(&ch_gk20a->bound, true, false)) { |
3595 | gk20a_writel(g, ccsr_channel_inst_r(ch_gk20a->chid), | 3595 | gk20a_writel(g, ccsr_channel_inst_r(ch_gk20a->chid), |
3596 | ccsr_channel_inst_ptr_f(0) | | 3596 | ccsr_channel_inst_ptr_f(0) | |
3597 | ccsr_channel_inst_bind_false_f()); | 3597 | ccsr_channel_inst_bind_false_f()); |