1 files changed, 46 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index a5c2efb3..0421c0f6 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -175,7 +175,7 @@ int gk20a_channel_get_timescale_from_timeslice(struct gk20a *g,
 }
 
 static int channel_gk20a_set_schedule_params(struct channel_gk20a *c,
-                                u32 timeslice_period)
+                                u32 timeslice_period, bool interleave)
 {
         void *inst_ptr;
         int shift = 0, value = 0;
@@ -203,6 +203,30 @@ static int channel_gk20a_set_schedule_params(struct channel_gk20a *c,
                 gk20a_readl(c->g, ccsr_channel_r(c->hw_chid)) |
                 ccsr_channel_enable_set_true_f());
 
+        if (c->interleave != interleave) {
+                mutex_lock(&c->g->interleave_lock);
+                c->interleave = interleave;
+                if (interleave)
+                        if (c->g->num_interleaved_channels >=
+                                        MAX_INTERLEAVED_CHANNELS) {
+                                gk20a_err(dev_from_gk20a(c->g),
+                                        "Change of priority would exceed runlist length, only changing timeslice\n");
+                                c->interleave = false;
+                        } else
+                                c->g->num_interleaved_channels += 1;
+                else
+                        c->g->num_interleaved_channels -= 1;
+
+                mutex_unlock(&c->g->interleave_lock);
+                gk20a_dbg_info("Set channel %d to interleave %d",
+                        c->hw_chid, c->interleave);
+
+                gk20a_fifo_set_channel_priority(
+                                c->g, 0, c->hw_chid, c->interleave);
+                c->g->ops.fifo.update_runlist(
+                                c->g, 0, ~0, true, false);
+        }
+
         return 0;
 }
 
@@ -836,6 +860,17 @@ static void gk20a_free_channel(struct channel_gk20a *ch)
         }
         mutex_unlock(&f->deferred_reset_mutex);
 
+        if (ch->interleave) {
+                ch->interleave = false;
+                gk20a_fifo_set_channel_priority(
+                                ch->g, 0, ch->hw_chid, ch->interleave);
+
+                mutex_lock(&f->g->interleave_lock);
+                WARN_ON(f->g->num_interleaved_channels == 0);
+                f->g->num_interleaved_channels -= 1;
+                mutex_unlock(&f->g->interleave_lock);
+        }
+
         if (!ch->bound)
                 goto release;
 
@@ -1079,6 +1114,10 @@ struct channel_gk20a *gk20a_open_new_channel(struct gk20a *g)
         ch->timeout_debug_dump = true;
         ch->has_timedout = false;
         ch->obj_class = 0;
+        ch->interleave = false;
+        gk20a_fifo_set_channel_priority(
+                        ch->g, 0, ch->hw_chid, ch->interleave);
+
 
         /* The channel is *not* runnable at this point. It still needs to have
          * an address space bound and allocate a gpfifo and grctx. */
@@ -2458,6 +2497,7 @@ static int gk20a_channel_set_priority(struct channel_gk20a *ch,
                 u32 priority)
 {
         u32 timeslice_timeout;
+        bool interleave = false;
 
         if (gk20a_is_channel_marked_as_tsg(ch)) {
                 gk20a_err(dev_from_gk20a(ch->g),
@@ -2474,15 +2514,17 @@ static int gk20a_channel_set_priority(struct channel_gk20a *ch,
                 timeslice_timeout = ch->g->timeslice_medium_priority_us;
                 break;
         case NVGPU_PRIORITY_HIGH:
+                if (ch->g->interleave_high_priority)
+                        interleave = true;
                 timeslice_timeout = ch->g->timeslice_high_priority_us;
                 break;
         default:
                 pr_err("Unsupported priority");
                 return -EINVAL;
         }
-        channel_gk20a_set_schedule_params(ch,
-                        timeslice_timeout);
-        return 0;
+
+        return channel_gk20a_set_schedule_params(ch,
+                        timeslice_timeout, interleave);
 }
 
 static int gk20a_channel_zcull_bind(struct channel_gk20a *ch,