1 files changed, 26 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 2dc8e9a0..92b4b3de 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -136,8 +136,10 @@ static int channel_gk20a_set_schedule_params(struct channel_gk20a *c,
                                 u32 timeslice_timeout)
 {
         void *inst_ptr;
+        struct gk20a_platform *platform = platform_get_drvdata(c->g->dev);
         int shift = 3;
-        int value = timeslice_timeout;
+        int value = scale_ptimer(timeslice_timeout,
+                        platform->ptimerscaling10x);
 
         inst_ptr = c->inst_block.cpu_va;
         if (!inst_ptr)
@@ -1474,8 +1476,11 @@ bool gk20a_channel_update_and_check_timeout(struct channel_gk20a *ch,
 
 static u32 gk20a_get_channel_watchdog_timeout(struct channel_gk20a *ch)
 {
-        if (ch->g->timeouts_enabled && ch->g->ch_wdt_enabled)
-                return NVGPU_CHANNEL_WATCHDOG_DEFAULT_TIMEOUT_MS;
+        struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev);
+
+        if (ch->g->timeouts_enabled && ch->g->ch_wdt_enabled &&
+                                platform->ch_wdt_timeout_ms)
+                return platform->ch_wdt_timeout_ms;
         else
                 return (u32)MAX_SCHEDULE_TIMEOUT;
 }
@@ -1568,6 +1573,21 @@ static void gk20a_channel_timeout_stop(struct channel_gk20a *ch)
         mutex_unlock(&ch->timeout.lock);
 }
 
+void gk20a_channel_timeout_stop_all_channels(struct gk20a *g)
+{
+        u32 chid;
+        struct fifo_gk20a *f = &g->fifo;
+
+        for (chid = 0; chid < f->num_channels; chid++) {
+                struct channel_gk20a *ch = &f->channel[chid];
+
+                if (gk20a_channel_get(ch)) {
+                        gk20a_channel_timeout_stop(ch);
+                        gk20a_channel_put(ch);
+                }
+        }
+}
+
 static void gk20a_channel_timeout_handler(struct work_struct *work)
 {
         struct channel_gk20a_job *job;
@@ -2339,16 +2359,13 @@ static int gk20a_channel_set_priority(struct channel_gk20a *ch,
         /* set priority of graphics channel */
         switch (priority) {
         case NVGPU_PRIORITY_LOW:
-                /* 64 << 3 = 512us */
-                timeslice_timeout = 64;
+                timeslice_timeout = ch->g->timeslice_low_priority_us;
                 break;
         case NVGPU_PRIORITY_MEDIUM:
-                /* 128 << 3 = 1024us */
-                timeslice_timeout = 128;
+                timeslice_timeout = ch->g->timeslice_medium_priority_us;
                 break;
         case NVGPU_PRIORITY_HIGH:
-                /* 255 << 3 = 2048us */
-                timeslice_timeout = 255;
+                timeslice_timeout = ch->g->timeslice_high_priority_us;
                 break;
         default:
                 pr_err("Unsupported priority");