From 1f71f475e25fe786ec76d76a986aac8afec51b01 Mon Sep 17 00:00:00 2001 From: David Nieto Date: Wed, 27 Dec 2017 14:28:29 -0800 Subject: DNI: gpu: nvgpu: Increase GV100 ctxsw timeouts During bringup and before nvlink is up GV100 on the DDPX platform operates with a very, very slow sysmem link. In order to get sysmem test to pass it is neccesary to significantly increase most timeouts by an order the magnitude. Bug 2040544 Change-Id: I26858afde4ae80c70f86b47cfff674b6b00b5bf8 Signed-off-by: David Nieto Reviewed-on: https://git-master.nvidia.com/r/1627417 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv100/fifo_gv100.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'drivers/gpu/nvgpu/gv100/fifo_gv100.c') diff --git a/drivers/gpu/nvgpu/gv100/fifo_gv100.c b/drivers/gpu/nvgpu/gv100/fifo_gv100.c index 79862f6b..0227720d 100644 --- a/drivers/gpu/nvgpu/gv100/fifo_gv100.c +++ b/drivers/gpu/nvgpu/gv100/fifo_gv100.c @@ -22,9 +22,12 @@ * DEALINGS IN THE SOFTWARE. */ +#include "gk20a/gk20a.h" #include "fifo_gv100.h" +#include #include +#include #define DEFAULT_FIFO_PREEMPT_TIMEOUT 0x3FFFFFUL @@ -38,3 +41,14 @@ u32 gv100_fifo_get_preempt_timeout(struct gk20a *g) return DEFAULT_FIFO_PREEMPT_TIMEOUT; } +void gv100_apply_ctxsw_timeout_intr(struct gk20a *g) +{ + u32 timeout; + + timeout = g->ch_wdt_timeout_ms*1000; + timeout = scale_ptimer(timeout, + ptimer_scalingfactor10x(g->ptimer_src_freq)); + timeout |= fifo_eng_timeout_detection_enabled_f(); + gk20a_writel(g, fifo_eng_timeout_r(), timeout); +} + -- cgit v1.2.2