From 5e33f58a5ee971cd846f9f2a41ed652a5f2b1523 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 1 May 2017 11:12:12 -0700 Subject: gpu: nvgpu: Move ch_wdt_timeout to gk20a Copy watchdog timeout from platform structure to gk20a and use it from gk20a. JIRA NVGPU-16 Change-Id: Iab70253a7f0e1d28f2e3209285b3f4c476ce9279 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1473705 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/driver_common.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index 34bd2062..14d4dd40 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c @@ -61,6 +61,8 @@ static void nvgpu_init_vars(struct gk20a *g) static void nvgpu_init_timeout(struct gk20a *g) { + struct gk20a_platform *platform = dev_get_drvdata(g->dev); + g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT; if (nvgpu_platform_is_silicon(g)) g->timeouts_enabled = true; @@ -68,6 +70,7 @@ static void nvgpu_init_timeout(struct gk20a *g) g->gr_idle_timeout_default = GK20A_TIMEOUT_FPGA; g->timeouts_enabled = true; } + g->ch_wdt_timeout_ms = platform->ch_wdt_timeout_ms; } static void nvgpu_init_timeslice(struct gk20a *g) -- cgit v1.2.2