2 files changed, 4 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index fb9c7712..8b5eef82 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -801,22 +801,17 @@ int gv11b_fifo_is_preempt_pending(struct gk20a *g, u32 id,
         return ret;
 }
 
-int gv11b_fifo_preempt_channel(struct gk20a *g, u32 chid)
+int gv11b_fifo_preempt_channel(struct gk20a *g, struct channel_gk20a *ch)
 {
-        struct fifo_gk20a *f = &g->fifo;
         struct tsg_gk20a *tsg = NULL;
 
-        if (chid == FIFO_INVAL_CHANNEL_ID) {
-                return 0;
-        }
-
-        tsg = tsg_gk20a_from_ch(&f->channel[chid]);
+        tsg = tsg_gk20a_from_ch(ch);
 
         if (tsg == NULL) {
                 return 0;
         }
 
-        nvgpu_log_info(g, "chid:%d tsgid:%d", chid, tsg->tsgid);
+        nvgpu_log_info(g, "chid:%d tsgid:%d", ch->chid, tsg->tsgid);
 
         /* Preempt tsg. Channel preempt is NOOP */
         return g->ops.fifo.preempt_tsg(g, tsg);
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h
index 7ff42637..3d491bad 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h
@@ -81,7 +81,7 @@ u32 gv11b_fifo_intr_0_error_mask(struct gk20a *g);
 int gv11b_fifo_reschedule_runlist(struct channel_gk20a *ch, bool preempt_next);
 int gv11b_fifo_is_preempt_pending(struct gk20a *g, u32 id,
                  unsigned int id_type);
-int gv11b_fifo_preempt_channel(struct gk20a *g, u32 chid);
+int gv11b_fifo_preempt_channel(struct gk20a *g, struct channel_gk20a *ch);
 int gv11b_fifo_preempt_tsg(struct gk20a *g, struct tsg_gk20a *tsg);
 int gv11b_fifo_enable_tsg(struct tsg_gk20a *tsg);
 void gv11b_fifo_teardown_ch_tsg(struct gk20a *g, u32 act_eng_bitmask,