1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 9691d51b..f4a4591d 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1172,7 +1172,7 @@ gk20a_refch_from_inst_ptr(struct gk20a *g, u64 inst_ptr)
                 struct channel_gk20a *ch;
                 u64 ch_inst_ptr;
 
-                ch = gk20a_channel_get(&f->channel[ci]);
+                ch = gk20a_channel_from_id(g, ci);
                 /* only alive channels are searched */
                 if (!ch) {
                         continue;
@@ -1959,9 +1959,9 @@ void gk20a_fifo_recover_ch(struct gk20a *g, u32 chid, bool verbose, int rc_type)
                 gk20a_fifo_recover(g, engines, chid, false, true, verbose,
                                         rc_type);
         } else {
-                struct channel_gk20a *ch = &g->fifo.channel[chid];
+                struct channel_gk20a *ch = gk20a_channel_from_id(g, chid);
 
-                if (gk20a_channel_get(ch)) {
+                if (ch != NULL) {
                         gk20a_channel_abort(ch, false);
 
                         if (gk20a_fifo_error_ch(g, ch)) {
@@ -2710,9 +2710,9 @@ static void gk20a_fifo_pbdma_fault_rc(struct gk20a *g,
         id = fifo_pbdma_status_id_v(status);
         if (fifo_pbdma_status_id_type_v(status)
                         == fifo_pbdma_status_id_type_chid_v()) {
-                struct channel_gk20a *ch = &f->channel[id];
+                struct channel_gk20a *ch = gk20a_channel_from_id(g, id);
 
-                if (gk20a_channel_get(ch)) {
+                if (ch != NULL) {
                         g->ops.fifo.set_error_notifier(ch, error_notifier);
                         gk20a_fifo_recover_ch(g, id, true, RC_TYPE_PBDMA_FAULT);
                         gk20a_channel_put(ch);
@@ -2924,12 +2924,12 @@ void gk20a_fifo_preempt_timeout_rc(struct gk20a *g, u32 id,
                 gk20a_fifo_recover_tsg(g, id, true,
                                                 RC_TYPE_PREEMPT_TIMEOUT);
         } else {
-                struct channel_gk20a *ch = &g->fifo.channel[id];
+                struct channel_gk20a *ch = gk20a_channel_from_id(g, id);
 
                 nvgpu_err(g,
                         "preempt channel %d timeout", id);
 
-                if (gk20a_channel_get(ch)) {
+                if (ch != NULL) {
                         g->ops.fifo.set_error_notifier(ch,
                                         NVGPU_ERR_NOTIFIER_FIFO_ERROR_IDLE_TIMEOUT);
                         gk20a_fifo_recover_ch(g, id, true,
@@ -4031,8 +4031,8 @@ void gk20a_debug_dump_all_channel_status_ramfc(struct gk20a *g,
         }
 
         for (chid = 0; chid < f->num_channels; chid++) {
-                struct channel_gk20a *ch = &f->channel[chid];
-                if (gk20a_channel_get(ch)) {
+                struct channel_gk20a *ch = gk20a_channel_from_id(g, chid);
+                if (ch != NULL) {
                         ch_state[chid] =
                                 nvgpu_kmalloc(g, sizeof(struct ch_state) +
                                         ram_in_alloc_size_v());