2 files changed, 13 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index f90bc1a3..1cc0f154 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -351,6 +351,16 @@ static void channel_gk20a_unbind(struct channel_gk20a *ch_gk20a)
                         ccsr_channel_inst_bind_false_f());
 
         ch_gk20a->bound = false;
+
+        /*
+         * if we are agrressive then we can destroy the syncpt
+         * resource at this point
+         * if not, then it will be destroyed at channel_free()
+         */
+        if (ch_gk20a->sync && ch_gk20a->sync->syncpt_aggressive_destroy) {
+                ch_gk20a->sync->destroy(ch_gk20a->sync);
+                ch_gk20a->sync = NULL;
+        }
 }
 
 static int channel_gk20a_alloc_inst(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h
index 69feb89f..80f38b26 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h
@@ -94,6 +94,9 @@ struct gk20a_channel_sync {
         /* Reset the channel syncpoint/semaphore. */
         void (*set_min_eq_max)(struct gk20a_channel_sync *s);
 
+        /* flag to set syncpt destroy aggressiveness */
+        bool syncpt_aggressive_destroy;
+
         /* Free the resources allocated by gk20a_channel_sync_create. */
         void (*destroy)(struct gk20a_channel_sync *s);
 };