diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 6 |
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 { | |||
1287 | static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g) | 1287 | static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g) |
1288 | { | 1288 | { |
1289 | return g->timeouts_enabled ? | 1289 | return g->timeouts_enabled ? |
1290 | g->gr_idle_timeout_default : MAX_SCHEDULE_TIMEOUT; | 1290 | g->gr_idle_timeout_default : ULONG_MAX; |
1291 | } | 1291 | } |
1292 | 1292 | ||
1293 | enum BAR0_DEBUG_OPERATION { | 1293 | 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, | |||
344 | 344 | ||
345 | gr_engine_id = gk20a_fifo_get_gr_engine_id(g); | 345 | gr_engine_id = gk20a_fifo_get_gr_engine_id(g); |
346 | 346 | ||
347 | nvgpu_timeout_init(g, &timeout, (int)duration_ms, | 347 | nvgpu_timeout_init(g, &timeout, duration_ms, NVGPU_TIMER_CPU_TIMER); |
348 | NVGPU_TIMER_CPU_TIMER); | ||
349 | 348 | ||
350 | do { | 349 | do { |
351 | /* fmodel: host gets fifo_engine_status(gr) from gr | 350 | /* 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, | |||
398 | 397 | ||
399 | gk20a_dbg_fn(""); | 398 | gk20a_dbg_fn(""); |
400 | 399 | ||
401 | nvgpu_timeout_init(g, &timeout, (int)duration_ms, | 400 | nvgpu_timeout_init(g, &timeout, duration_ms, NVGPU_TIMER_CPU_TIMER); |
402 | NVGPU_TIMER_CPU_TIMER); | ||
403 | 401 | ||
404 | do { | 402 | do { |
405 | val = gk20a_readl(g, gr_status_r()); | 403 | val = gk20a_readl(g, gr_status_r()); |