1 files changed, 26 insertions, 61 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
index d4ece147..42d92f43 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
@@ -30,63 +30,27 @@ bool gk20a_is_channel_marked_as_tsg(struct channel_gk20a *ch)
 }
 
 /*
- * API to add channel to runnable list of TSG.
- *
- * After this call, a channel will be scheduled as TSG channel
- * in runlist
- */
-int gk20a_bind_runnable_channel_to_tsg(struct channel_gk20a *ch, int tsgid)
-{
-        struct gk20a *g = ch->g;
-        struct tsg_gk20a *tsg = NULL;
-
-        if (ch->tsgid != tsgid)
-                return -EINVAL;
-
-        tsg = &g->fifo.tsg[tsgid];
-
-        mutex_lock(&tsg->ch_list_lock);
-        list_add_tail(&ch->ch_entry, &tsg->ch_runnable_list);
-        tsg->num_runnable_channels += 1;
-        mutex_unlock(&tsg->ch_list_lock);
-
-        return tsg->num_runnable_channels;
-}
-
-int gk20a_unbind_channel_from_tsg(struct channel_gk20a *ch, int tsgid)
-{
-        struct gk20a *g = ch->g;
-        struct tsg_gk20a *tsg = NULL;
-
-        if (ch->tsgid != tsgid)
-                return -EINVAL;
-
-        tsg = &g->fifo.tsg[tsgid];
-
-        mutex_lock(&tsg->ch_list_lock);
-        list_del_init(&ch->ch_entry);
-        tsg->num_runnable_channels -= 1;
-        mutex_unlock(&tsg->ch_list_lock);
-
-        return tsg->num_runnable_channels;
-}
-
-/*
  * API to mark channel as part of TSG
  *
  * Note that channel is not runnable when we bind it to TSG
  */
-static int nvgpu_tsg_bind_channel(struct tsg_gk20a *tsg, int ch_fd)
+static int gk20a_tsg_bind_channel(struct tsg_gk20a *tsg, int ch_fd)
 {
         struct file *f = fget(ch_fd);
         struct channel_gk20a *ch = f->private_data;
 
         /* check if channel is already bound to some TSG */
-        if (gk20a_is_channel_marked_as_tsg(ch))
+        if (gk20a_is_channel_marked_as_tsg(ch)) {
+                fput(f);
                 return -EINVAL;
+        }
 
         ch->tsgid = tsg->tsgid;
 
+        mutex_lock(&tsg->ch_list_lock);
+        list_add_tail(&ch->ch_entry, &tsg->ch_list);
+        mutex_unlock(&tsg->ch_list_lock);
+
         gk20a_dbg(gpu_dbg_fn, "BIND tsg:%d channel:%d\n",
                                         tsg->tsgid, ch->hw_chid);
 
@@ -95,11 +59,17 @@ static int nvgpu_tsg_bind_channel(struct tsg_gk20a *tsg, int ch_fd)
         return 0;
 }
 
-static int nvgpu_tsg_unbind_channel(struct tsg_gk20a *tsg, int ch_fd)
+int gk20a_tsg_unbind_channel(struct channel_gk20a *ch)
 {
-        /* We do not support explicitly unbinding channel from TSG.
-         * Channel will be unbounded from TSG when it is closed.
-         */
+        struct fifo_gk20a *f = &ch->g->fifo;
+        struct tsg_gk20a *tsg = &f->tsg[ch->tsgid];
+
+        mutex_lock(&tsg->ch_list_lock);
+        list_del_init(&ch->ch_entry);
+        mutex_unlock(&tsg->ch_list_lock);
+
+        ch->tsgid = NVGPU_INVALID_TSG_ID;
+
         return 0;
 }
 
@@ -115,7 +85,7 @@ int gk20a_init_tsg_support(struct gk20a *g, u32 tsgid)
         tsg->in_use = false;
         tsg->tsgid = tsgid;
 
-        INIT_LIST_HEAD(&tsg->ch_runnable_list);
+        INIT_LIST_HEAD(&tsg->ch_list);
         mutex_init(&tsg->ch_list_lock);
 
         return 0;
@@ -163,7 +133,7 @@ int gk20a_tsg_dev_open(struct inode *inode, struct file *filp)
                 return -ENOMEM;
 
         tsg->g = g;
-        tsg->num_runnable_channels = 0;
+        tsg->num_active_channels = 0;
 
         tsg->tsg_gr_ctx = NULL;
         tsg->vm = NULL;
@@ -181,10 +151,10 @@ int gk20a_tsg_dev_release(struct inode *inode, struct file *filp)
         struct gk20a *g = container_of(inode->i_cdev,
                          struct gk20a, tsg.cdev);
 
-        if (tsg->num_runnable_channels) {
+        if (tsg->num_active_channels) {
                 gk20a_err(dev_from_gk20a(g),
                         "Trying to free TSG %d with active channels %d\n",
-                        tsg->tsgid, tsg->num_runnable_channels);
+                        tsg->tsgid, tsg->num_active_channels);
                 return -EBUSY;
         }
 
@@ -240,20 +210,15 @@ long gk20a_tsg_dev_ioctl(struct file *filp, unsigned int cmd,
                         err = -EINVAL;
                         break;
                 }
-                err = nvgpu_tsg_bind_channel(tsg, ch_fd);
+                err = gk20a_tsg_bind_channel(tsg, ch_fd);
                 break;
                 }
 
         case NVGPU_TSG_IOCTL_UNBIND_CHANNEL:
-                {
-                int ch_fd = *(int *)buf;
-                if (ch_fd < 0) {
-                        err = -EINVAL;
-                        break;
-                }
-                err = nvgpu_tsg_unbind_channel(tsg, ch_fd);
+                /* We do not support explicitly unbinding channel from TSG.
+                 * Channel will be unbounded from TSG when it is closed.
+                 */
                 break;
-                }
 
         default:
                 gk20a_err(dev_from_gk20a(g),