gpu: nvgpu: gv100: fix timeout handling

GV100 has a larger vidmem size and a slower sideband to sysmem so timeouts
need to be adjusted to avoid false positives.

JIRA: NVGPUGV100-36

Change-Id: I3cbc19aa1158c89bc48ae1fa6ec4bc755cd9389d
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1582092
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 10 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index 7bb3d654..4a03e6d9 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -372,6 +372,11 @@ u32 gv11b_fifo_intr_0_error_mask(struct gk20a *g)
         return intr_0_error_mask;
 }
 
+u32 gv11b_fifo_get_preempt_timeout(struct gk20a *g)
+{
+        return gk20a_get_gr_idle_timeout(g);
+}
+
 static int gv11b_fifo_poll_pbdma_chan_status(struct gk20a *g, u32 id,
                                  u32 pbdma_id, unsigned int timeout_rc_type)
 {
@@ -405,7 +410,7 @@ static int gv11b_fifo_poll_pbdma_chan_status(struct gk20a *g, u32 id,
                         gk20a_writel(g, pbdma_intr_1_r(pbdma_id), pbdma_intr_1);
         }
 
-        nvgpu_timeout_init(g, &timeout, gk20a_get_gr_idle_timeout(g),
+        nvgpu_timeout_init(g, &timeout, g->ops.fifo.get_preempt_timeout(g),
                            NVGPU_TIMER_CPU_TIMER);
 
         /* Verify that ch/tsg is no longer on the pbdma */
@@ -465,7 +470,7 @@ static int gv11b_fifo_poll_eng_ctx_status(struct gk20a *g, u32 id,
         u32 ctx_stat;
         int ret = -EBUSY;
 
-        nvgpu_timeout_init(g, &timeout, gk20a_get_gr_idle_timeout(g),
+        nvgpu_timeout_init(g, &timeout, g->ops.fifo.get_preempt_timeout(g),
                            NVGPU_TIMER_CPU_TIMER);
 
         /* Check if ch/tsg has saved off the engine or if ctxsw is hung */
@@ -686,7 +691,7 @@ static int gv11b_fifo_poll_runlist_preempt_pending(struct gk20a *g,
         u32 delay = GR_IDLE_CHECK_DEFAULT;
         int ret = -EBUSY;
 
-        nvgpu_timeout_init(g, &timeout, gk20a_get_gr_idle_timeout(g),
+        nvgpu_timeout_init(g, &timeout, g->ops.fifo.get_preempt_timeout(g),
                            NVGPU_TIMER_CPU_TIMER);
         do {
                 if (!((gk20a_readl(g, fifo_runlist_preempt_r())) &
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h
index f622aba8..fc1ddf83 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h
@@ -113,5 +113,5 @@ u32 gv11b_fifo_get_syncpt_incr_cmd_size(bool wfi_cmd);
 int gv11b_init_fifo_setup_hw(struct gk20a *g);
 
 void gv11b_fifo_tsg_verify_status_faulted(struct channel_gk20a *ch);
-
+u32 gv11b_fifo_get_preempt_timeout(struct gk20a *g);
 #endif
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 729727c9..5b10b7d2 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -438,6 +438,7 @@ static const struct gpu_ops gv11b_ops = {
                         gr_gv11b_pg_gr_load_gating_prod,
         },
         .fifo = {
+                .get_preempt_timeout = gv11b_fifo_get_preempt_timeout,
                 .init_fifo_setup_hw = gv11b_init_fifo_setup_hw,
                 .bind_channel = channel_gm20b_bind,
                 .unbind_channel = channel_gv11b_unbind,