From a112c5d9dde792beb576d8f3d0abdd99ede98053 Mon Sep 17 00:00:00 2001 From: Vedashree Vidwans Date: Mon, 28 Sep 2020 11:28:35 -0700 Subject: [PATCH] gpu: nvgpu: modify channel wdt for non-si Increase channel watchdog value for non-si platforms. Bug 3553564 Change-Id: I42277255599afb09b11f8321ca9b2f124f502933 Signed-off-by: Vedashree Vidwans Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2420872 Tested-by: Sagar Kadamati Reviewed-by: svc-mobile-coverity Reviewed-by: svcacv Reviewed-by: Seema Khowala Reviewed-by: Vijayakumar Subbu GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/os/linux/driver_common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/os/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c index 9a4e6fd18..4623aafa2 100644 --- a/drivers/gpu/nvgpu/os/linux/driver_common.c +++ b/drivers/gpu/nvgpu/os/linux/driver_common.c @@ -152,12 +152,14 @@ static void nvgpu_init_timeout(struct gk20a *g) if (nvgpu_platform_is_silicon(g)) { g->poll_timeout_default = NVGPU_DEFAULT_POLL_TIMEOUT_MS; + g->ch_wdt_init_limit_ms = platform->ch_wdt_init_limit_ms; } else if (nvgpu_platform_is_fpga(g)) { g->poll_timeout_default = NVGPU_DEFAULT_FPGA_TIMEOUT_MS; + g->ch_wdt_init_limit_ms = 100U * platform->ch_wdt_init_limit_ms; } else { g->poll_timeout_default = (u32)ULONG_MAX; + g->ch_wdt_init_limit_ms = 100U * platform->ch_wdt_init_limit_ms; } - g->ch_wdt_init_limit_ms = platform->ch_wdt_init_limit_ms; g->ctxsw_timeout_period_ms = CTXSW_TIMEOUT_PERIOD_MS; }