gpu: nvgpu: replace input param chid with pointer to channel

preempt_channel needs to use the channel to pass it to other
public functions, get access to a tsg etc. This qualifies it to take a
pointer to a channel as an input parameter instead of a chid.

Increment the channel ref counter using the function
gk20a_channel_from_id in functions where we get the chid from the h/w
registers directly. Once the prempt_channel function call is done,
use a gk20a_channel_put on the referenced channel.

Jira NVGPU-1461

Change-Id: I6c87c8104cfcb418d468c8c590087fd4aeabf4bd
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1963200
(cherry picked from commit 9abe9fe062367902ede7721cff55396859f8e4e8
in dev-kernel)
Reviewed-on: https://git-master.nvidia.com/r/2013728
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 3 insertions, 8 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);