diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/debug_fifo.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_channel.c | 14 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/semaphore.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/debug_fifo.c b/drivers/gpu/nvgpu/common/linux/debug_fifo.c index 6a28b1a5..04937dbe 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_fifo.c +++ b/drivers/gpu/nvgpu/common/linux/debug_fifo.c | |||
@@ -77,7 +77,7 @@ static int gk20a_fifo_sched_debugfs_seq_show( | |||
77 | ret = 0; | 77 | ret = 0; |
78 | } | 78 | } |
79 | 79 | ||
80 | if (!test_bit(ch->hw_chid, runlist->active_channels)) | 80 | if (!test_bit(ch->chid, runlist->active_channels)) |
81 | return ret; | 81 | return ret; |
82 | 82 | ||
83 | if (gk20a_channel_get(ch)) { | 83 | if (gk20a_channel_get(ch)) { |
@@ -85,7 +85,7 @@ static int gk20a_fifo_sched_debugfs_seq_show( | |||
85 | tsg = &f->tsg[ch->tsgid]; | 85 | tsg = &f->tsg[ch->tsgid]; |
86 | 86 | ||
87 | seq_printf(s, "%-8d %-8d %-8d %-9d %-8d %-10d %-8d %-8d\n", | 87 | seq_printf(s, "%-8d %-8d %-8d %-9d %-8d %-10d %-8d %-8d\n", |
88 | ch->hw_chid, | 88 | ch->chid, |
89 | ch->tsgid, | 89 | ch->tsgid, |
90 | ch->tgid, | 90 | ch->tgid, |
91 | tsg ? tsg->timeslice_us : ch->timeslice_us, | 91 | tsg ? tsg->timeslice_us : ch->timeslice_us, |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c index 2466db40..5905e5a6 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c | |||
@@ -42,7 +42,7 @@ static void gk20a_channel_trace_sched_param( | |||
42 | const char *compute_preempt_mode), | 42 | const char *compute_preempt_mode), |
43 | struct channel_gk20a *ch) | 43 | struct channel_gk20a *ch) |
44 | { | 44 | { |
45 | (trace)(ch->hw_chid, ch->tsgid, ch->pid, | 45 | (trace)(ch->chid, ch->tsgid, ch->pid, |
46 | gk20a_is_channel_marked_as_tsg(ch) ? | 46 | gk20a_is_channel_marked_as_tsg(ch) ? |
47 | tsg_gk20a_from_ch(ch)->timeslice_us : ch->timeslice_us, | 47 | tsg_gk20a_from_ch(ch)->timeslice_us : ch->timeslice_us, |
48 | ch->timeout_ms_max, | 48 | ch->timeout_ms_max, |
@@ -525,7 +525,7 @@ static int gk20a_channel_wait(struct channel_gk20a *ch, | |||
525 | notif->timestamp.nanoseconds[0] = tv.tv_nsec; | 525 | notif->timestamp.nanoseconds[0] = tv.tv_nsec; |
526 | notif->timestamp.nanoseconds[1] = tv.tv_sec; | 526 | notif->timestamp.nanoseconds[1] = tv.tv_sec; |
527 | notif->info32 = 0xDEADBEEF; /* should be object name */ | 527 | notif->info32 = 0xDEADBEEF; /* should be object name */ |
528 | notif->info16 = ch->hw_chid; /* should be method offset */ | 528 | notif->info16 = ch->chid; /* should be method offset */ |
529 | 529 | ||
530 | notif_clean_up: | 530 | notif_clean_up: |
531 | dma_buf_vunmap(dmabuf, notif); | 531 | dma_buf_vunmap(dmabuf, notif); |
@@ -578,7 +578,7 @@ static unsigned int gk20a_event_id_poll(struct file *filep, poll_table *wait) | |||
578 | if (event_id_data->event_posted) { | 578 | if (event_id_data->event_posted) { |
579 | gk20a_dbg_info( | 579 | gk20a_dbg_info( |
580 | "found pending event_id=%d on chid=%d\n", | 580 | "found pending event_id=%d on chid=%d\n", |
581 | event_id, ch->hw_chid); | 581 | event_id, ch->chid); |
582 | mask = (POLLPRI | POLLIN); | 582 | mask = (POLLPRI | POLLIN); |
583 | event_id_data->event_posted = false; | 583 | event_id_data->event_posted = false; |
584 | } | 584 | } |
@@ -662,7 +662,7 @@ void gk20a_channel_event_id_post_event(struct channel_gk20a *ch, | |||
662 | 662 | ||
663 | gk20a_dbg_info( | 663 | gk20a_dbg_info( |
664 | "posting event for event_id=%d on ch=%d\n", | 664 | "posting event for event_id=%d on ch=%d\n", |
665 | event_id, ch->hw_chid); | 665 | event_id, ch->chid); |
666 | event_id_data->event_posted = true; | 666 | event_id_data->event_posted = true; |
667 | 667 | ||
668 | wake_up_interruptible_all(&event_id_data->event_id_wq); | 668 | wake_up_interruptible_all(&event_id_data->event_id_wq); |
@@ -713,7 +713,7 @@ static int gk20a_channel_event_id_enable(struct channel_gk20a *ch, | |||
713 | goto clean_up_file; | 713 | goto clean_up_file; |
714 | } | 714 | } |
715 | event_id_data->g = g; | 715 | event_id_data->g = g; |
716 | event_id_data->id = ch->hw_chid; | 716 | event_id_data->id = ch->chid; |
717 | event_id_data->is_tsg = false; | 717 | event_id_data->is_tsg = false; |
718 | event_id_data->event_id = event_id; | 718 | event_id_data->event_id = event_id; |
719 | 719 | ||
@@ -1006,7 +1006,7 @@ long gk20a_channel_ioctl(struct file *filp, | |||
1006 | u32 timeout = | 1006 | u32 timeout = |
1007 | (u32)((struct nvgpu_set_timeout_args *)buf)->timeout; | 1007 | (u32)((struct nvgpu_set_timeout_args *)buf)->timeout; |
1008 | gk20a_dbg(gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d", | 1008 | gk20a_dbg(gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d", |
1009 | timeout, ch->hw_chid); | 1009 | timeout, ch->chid); |
1010 | ch->timeout_ms_max = timeout; | 1010 | ch->timeout_ms_max = timeout; |
1011 | gk20a_channel_trace_sched_param( | 1011 | gk20a_channel_trace_sched_param( |
1012 | trace_gk20a_channel_set_timeout, ch); | 1012 | trace_gk20a_channel_set_timeout, ch); |
@@ -1020,7 +1020,7 @@ long gk20a_channel_ioctl(struct file *filp, | |||
1020 | ((struct nvgpu_set_timeout_ex_args *)buf)->flags & | 1020 | ((struct nvgpu_set_timeout_ex_args *)buf)->flags & |
1021 | (1 << NVGPU_TIMEOUT_FLAG_DISABLE_DUMP)); | 1021 | (1 << NVGPU_TIMEOUT_FLAG_DISABLE_DUMP)); |
1022 | gk20a_dbg(gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d", | 1022 | gk20a_dbg(gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d", |
1023 | timeout, ch->hw_chid); | 1023 | timeout, ch->chid); |
1024 | ch->timeout_ms_max = timeout; | 1024 | ch->timeout_ms_max = timeout; |
1025 | ch->timeout_debug_dump = timeout_debug_dump; | 1025 | ch->timeout_debug_dump = timeout_debug_dump; |
1026 | gk20a_channel_trace_sched_param( | 1026 | gk20a_channel_trace_sched_param( |
diff --git a/drivers/gpu/nvgpu/common/semaphore.c b/drivers/gpu/nvgpu/common/semaphore.c index a54ce831..3e916b9d 100644 --- a/drivers/gpu/nvgpu/common/semaphore.c +++ b/drivers/gpu/nvgpu/common/semaphore.c | |||
@@ -433,7 +433,7 @@ struct nvgpu_semaphore *nvgpu_semaphore_alloc(struct channel_gk20a *ch) | |||
433 | */ | 433 | */ |
434 | nvgpu_semaphore_pool_get(s->hw_sema->p); | 434 | nvgpu_semaphore_pool_get(s->hw_sema->p); |
435 | 435 | ||
436 | gpu_sema_dbg(ch->g, "Allocated semaphore (c=%d)", ch->hw_chid); | 436 | gpu_sema_dbg(ch->g, "Allocated semaphore (c=%d)", ch->chid); |
437 | 437 | ||
438 | return s; | 438 | return s; |
439 | } | 439 | } |