2 files changed, 3 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index f365ac94..dd5f0d17 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -1287,7 +1287,7 @@ struct gk20a {
 static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g)
 {
         return g->timeouts_enabled ?
-                g->gr_idle_timeout_default : MAX_SCHEDULE_TIMEOUT;
+                g->gr_idle_timeout_default : ULONG_MAX;
 }
 
 enum BAR0_DEBUG_OPERATION {
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index c5dab0b5..4dfb6ee8 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -344,8 +344,7 @@ int gr_gk20a_wait_idle(struct gk20a *g, unsigned long duration_ms,
 
         gr_engine_id = gk20a_fifo_get_gr_engine_id(g);
 
-        nvgpu_timeout_init(g, &timeout, (int)duration_ms,
-                           NVGPU_TIMER_CPU_TIMER);
+        nvgpu_timeout_init(g, &timeout, duration_ms, NVGPU_TIMER_CPU_TIMER);
 
         do {
                 /* fmodel: host gets fifo_engine_status(gr) from gr
@@ -398,8 +397,7 @@ int gr_gk20a_wait_fe_idle(struct gk20a *g, unsigned long duration_ms,
 
         gk20a_dbg_fn("");
 
-        nvgpu_timeout_init(g, &timeout, (int)duration_ms,
-                           NVGPU_TIMER_CPU_TIMER);
+        nvgpu_timeout_init(g, &timeout, duration_ms, NVGPU_TIMER_CPU_TIMER);
 
         do {
                 val = gk20a_readl(g, gr_status_r());