gpu: nvgpu: Immediate channel release

When closing channel, disable and preempt it immediately instead of
waiting for it to finish all work.

Bug 1683059

Change-Id: Ia5f5fc6a072dc3ddb1e9bf63534814ff0a60b5b4
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/836746

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index a4ec5254..d8da6f3f 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -527,8 +527,6 @@ out:
 static int vgpu_gr_free_obj_ctx(struct channel_gk20a  *c,
                                 struct nvgpu_free_obj_ctx_args *args)
 {
-        unsigned long timeout = gk20a_get_gr_idle_timeout(c->g);
-
         gk20a_dbg_fn("");
 
         if (c->num_objects == 0)
@@ -538,9 +536,7 @@ static int vgpu_gr_free_obj_ctx(struct channel_gk20a  *c,
 
         if (c->num_objects == 0) {
                 c->first_init = false;
-                gk20a_disable_channel(c,
-                        !c->has_timedout,
-                        timeout);
+                gk20a_disable_channel(c);
         }
 
         return 0;