3 files changed, 4 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index aa5abec9..8821e799 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -721,8 +721,7 @@ static void vgpu_fifo_set_ctx_mmu_error_ch_tsg(struct gk20a *g,
 
 int vgpu_fifo_isr(struct gk20a *g, struct tegra_vgpu_fifo_intr_info *info)
 {
-        struct fifo_gk20a *f = &g->fifo;
-        struct channel_gk20a *ch = gk20a_channel_get(&f->channel[info->chid]);
+        struct channel_gk20a *ch = gk20a_channel_from_id(g, info->chid);
 
         nvgpu_log_fn(g, " ");
         if (!ch)
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index 9fafa52f..6a86c9a0 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -953,10 +953,10 @@ int vgpu_init_gr_support(struct gk20a *g)
 
 int vgpu_gr_isr(struct gk20a *g, struct tegra_vgpu_gr_intr_info *info)
 {
-        struct fifo_gk20a *f = &g->fifo;
-        struct channel_gk20a *ch = gk20a_channel_get(&f->channel[info->chid]);
+        struct channel_gk20a *ch = gk20a_channel_from_id(g, info->chid);
 
         nvgpu_log_fn(g, " ");
+
         if (!ch)
                 return 0;
 
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 266b801e..07361afe 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -119,7 +119,7 @@ static void vgpu_handle_channel_event(struct gk20a *g,
 
 static void vgpu_channel_abort_cleanup(struct gk20a *g, u32 chid)
 {
-        struct channel_gk20a *ch = gk20a_channel_get(&g->fifo.channel[chid]);
+        struct channel_gk20a *ch = gk20a_channel_from_id(g, chid);
 
         if (ch == NULL) {
                 nvgpu_err(g, "invalid channel id %d", chid);