diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/fifo_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index fcf05306..7e0bbf81 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -387,13 +387,12 @@ u32 gv11b_fifo_intr_0_error_mask(struct gk20a *g) | |||
387 | 387 | ||
388 | u32 gv11b_fifo_get_preempt_timeout(struct gk20a *g) | 388 | u32 gv11b_fifo_get_preempt_timeout(struct gk20a *g) |
389 | { | 389 | { |
390 | /* if timeouts are enabled, using 3000ms timeout | 390 | /* using gr_idle_timeout for polling pdma/eng/runlist |
391 | * for polling pdma/eng/runlist might kick in | 391 | * might kick in timeout handler in the cases where |
392 | * timeout handler in the cases where preempt | 392 | * preempt is stuck. Use fifo_eng_timeout converted to ms |
393 | * is stuck. Use 1000ms timeout for polling when | 393 | * for preempt polling */ |
394 | * timeouts are enabled */ | 394 | |
395 | return nvgpu_is_timeouts_enabled(g) ? PREEMPT_TIMEOUT_1000_MS : | 395 | return g->fifo_eng_timeout_us / 1000 ; |
396 | g->gr_idle_timeout_default; | ||
397 | } | 396 | } |
398 | 397 | ||
399 | static int gv11b_fifo_poll_pbdma_chan_status(struct gk20a *g, u32 id, | 398 | static int gv11b_fifo_poll_pbdma_chan_status(struct gk20a *g, u32 id, |