gpu: nvgpu: rename hw_chid to chid

hw_chid is a relative id for vgpu. For native it's same as hw id.
Renaming it to chid to avoid confusing.

Jira VFND-3796

Change-Id: I1c7924da1757330ace715a7c52ac61ec9dc7065c
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master/r/1509530
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

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(
                 ret = 0;
         }
 
-        if (!test_bit(ch->hw_chid, runlist->active_channels))
+        if (!test_bit(ch->chid, runlist->active_channels))
                 return ret;
 
         if (gk20a_channel_get(ch)) {
@@ -85,7 +85,7 @@ static int gk20a_fifo_sched_debugfs_seq_show(
                         tsg = &f->tsg[ch->tsgid];
 
                 seq_printf(s, "%-8d %-8d %-8d %-9d %-8d %-10d %-8d %-8d\n",
-                                ch->hw_chid,
+                                ch->chid,
                                 ch->tsgid,
                                 ch->tgid,
                                 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(
                 const char *compute_preempt_mode),
         struct channel_gk20a *ch)
 {
-        (trace)(ch->hw_chid, ch->tsgid, ch->pid,
+        (trace)(ch->chid, ch->tsgid, ch->pid,
                 gk20a_is_channel_marked_as_tsg(ch) ?
                         tsg_gk20a_from_ch(ch)->timeslice_us : ch->timeslice_us,
                 ch->timeout_ms_max,
@@ -525,7 +525,7 @@ static int gk20a_channel_wait(struct channel_gk20a *ch,
                 notif->timestamp.nanoseconds[0] = tv.tv_nsec;
                 notif->timestamp.nanoseconds[1] = tv.tv_sec;
                 notif->info32 = 0xDEADBEEF; /* should be object name */
-                notif->info16 = ch->hw_chid; /* should be method offset */
+                notif->info16 = ch->chid; /* should be method offset */
 
 notif_clean_up:
                 dma_buf_vunmap(dmabuf, notif);
@@ -578,7 +578,7 @@ static unsigned int gk20a_event_id_poll(struct file *filep, poll_table *wait)
                 if (event_id_data->event_posted) {
                         gk20a_dbg_info(
                                 "found pending event_id=%d on chid=%d\n",
-                                event_id, ch->hw_chid);
+                                event_id, ch->chid);
                         mask = (POLLPRI | POLLIN);
                         event_id_data->event_posted = false;
                 }
@@ -662,7 +662,7 @@ void gk20a_channel_event_id_post_event(struct channel_gk20a *ch,
 
         gk20a_dbg_info(
                 "posting event for event_id=%d on ch=%d\n",
-                event_id, ch->hw_chid);
+                event_id, ch->chid);
         event_id_data->event_posted = true;
 
         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,
                 goto clean_up_file;
         }
         event_id_data->g = g;
-        event_id_data->id = ch->hw_chid;
+        event_id_data->id = ch->chid;
         event_id_data->is_tsg = false;
         event_id_data->event_id = event_id;
 
@@ -1006,7 +1006,7 @@ long gk20a_channel_ioctl(struct file *filp,
                 u32 timeout =
                         (u32)((struct nvgpu_set_timeout_args *)buf)->timeout;
                 gk20a_dbg(gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d",
-                           timeout, ch->hw_chid);
+                           timeout, ch->chid);
                 ch->timeout_ms_max = timeout;
                 gk20a_channel_trace_sched_param(
                         trace_gk20a_channel_set_timeout, ch);
@@ -1020,7 +1020,7 @@ long gk20a_channel_ioctl(struct file *filp,
                         ((struct nvgpu_set_timeout_ex_args *)buf)->flags &
                         (1 << NVGPU_TIMEOUT_FLAG_DISABLE_DUMP));
                 gk20a_dbg(gpu_dbg_gpu_dbg, "setting timeout (%d ms) for chid %d",
-                           timeout, ch->hw_chid);
+                           timeout, ch->chid);
                 ch->timeout_ms_max = timeout;
                 ch->timeout_debug_dump = timeout_debug_dump;
                 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)
          */
         nvgpu_semaphore_pool_get(s->hw_sema->p);
 
-        gpu_sema_dbg(ch->g, "Allocated semaphore (c=%d)", ch->hw_chid);
+        gpu_sema_dbg(ch->g, "Allocated semaphore (c=%d)", ch->chid);
 
         return s;
 }