1 files changed, 17 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 6015ab5e..8db885e3 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -42,6 +42,8 @@
 
 #define NVMAP_HANDLE_PARAM_SIZE 1
 
+#define NVGPU_BEGIN_AGGRESSIVE_SYNC_DESTROY_LIMIT       64      /* channels */
+
 static struct channel_gk20a *allocate_channel(struct fifo_gk20a *f);
 static void free_channel(struct fifo_gk20a *f, struct channel_gk20a *c);
 
@@ -64,6 +66,7 @@ static void gk20a_free_error_notifiers(struct channel_gk20a *ch);
 static struct channel_gk20a *allocate_channel(struct fifo_gk20a *f)
 {
         struct channel_gk20a *ch = NULL;
+        struct gk20a_platform *platform = gk20a_get_platform(f->g->dev);
 
         mutex_lock(&f->free_chs_mutex);
         if (!list_empty(&f->free_chs)) {
@@ -72,21 +75,31 @@ static struct channel_gk20a *allocate_channel(struct fifo_gk20a *f)
                 list_del(&ch->free_chs);
                 WARN_ON(atomic_read(&ch->ref_count));
                 WARN_ON(ch->referenceable);
+                f->used_channels++;
         }
         mutex_unlock(&f->free_chs_mutex);
 
+        if (f->used_channels > NVGPU_BEGIN_AGGRESSIVE_SYNC_DESTROY_LIMIT)
+                platform->aggressive_sync_destroy = true;
+
         return ch;
 }
 
 static void free_channel(struct fifo_gk20a *f,
                 struct channel_gk20a *ch)
 {
+        struct gk20a_platform *platform = gk20a_get_platform(f->g->dev);
+
         trace_gk20a_release_used_channel(ch->hw_chid);
         /* refcount is zero here and channel is in a freed/dead state */
         mutex_lock(&f->free_chs_mutex);
         /* add to head to increase visibility of timing-related bugs */
         list_add(&ch->free_chs, &f->free_chs);
+        f->used_channels--;
         mutex_unlock(&f->free_chs_mutex);
+
+        if (f->used_channels < NVGPU_BEGIN_AGGRESSIVE_SYNC_DESTROY_LIMIT)
+                platform->aggressive_sync_destroy = false;
 }
 
 int channel_gk20a_commit_va(struct channel_gk20a *c)
@@ -311,6 +324,7 @@ static void channel_gk20a_bind(struct channel_gk20a *ch_gk20a)
 void channel_gk20a_unbind(struct channel_gk20a *ch_gk20a)
 {
         struct gk20a *g = ch_gk20a->g;
+        struct gk20a_platform *platform = gk20a_get_platform(g->dev);
 
         gk20a_dbg_fn("");
 
@@ -327,8 +341,7 @@ void channel_gk20a_unbind(struct channel_gk20a *ch_gk20a)
          * if not, then it will be destroyed at channel_free()
          */
         mutex_lock(&ch_gk20a->sync_lock);
-        if (ch_gk20a->sync && ch_gk20a->sync->aggressive_destroy) {
-
+        if (ch_gk20a->sync && platform->aggressive_sync_destroy) {
                 ch_gk20a->sync->destroy(ch_gk20a->sync);
                 ch_gk20a->sync = NULL;
         }
@@ -1715,6 +1728,7 @@ void gk20a_channel_update(struct channel_gk20a *c, int nr_completed)
 {
         struct vm_gk20a *vm = c->vm;
         struct channel_gk20a_job *job, *n;
+        struct gk20a_platform *platform = gk20a_get_platform(c->g->dev);
 
         trace_gk20a_channel_update(c->hw_chid);
 
@@ -1769,7 +1783,7 @@ void gk20a_channel_update(struct channel_gk20a *c, int nr_completed)
          */
         if (list_empty(&c->jobs)) {
                 mutex_lock(&c->sync_lock);
-                if (c->sync && c->sync->aggressive_destroy &&
+                if (c->sync && platform->aggressive_sync_destroy &&
                           gk20a_fence_is_expired(c->last_submit.post_fence)) {
                         c->sync->destroy(c->sync);
                         c->sync = NULL;