1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 79d449e6..795c7910 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -951,6 +951,14 @@ static void gk20a_free_channel(struct channel_gk20a *ch)
         }
         mutex_unlock(&ch->sync_lock);
 
+        /*
+         * free the channel used semaphore index.
+         * we need to do this before releasing the address space,
+         * as the semaphore pool might get freed after that point.
+         */
+        if (ch->hw_sema)
+                gk20a_semaphore_free_hw_sema(ch);
+
         /* release channel binding to the as_share */
         if (ch_vm->as_share)
                 gk20a_as_release_share(ch_vm->as_share);
@@ -974,10 +982,6 @@ unbind:
         g->ops.fifo.unbind_channel(ch);
         g->ops.fifo.free_inst(g, ch);
 
-        /* free the channel used semaphore index */
-        if (ch->hw_sema)
-                gk20a_semaphore_free_hw_sema(ch);
-
         ch->vpr = false;
         ch->vm = NULL;