summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r--drivers/gpu/nvgpu/common/linux/driver_common.c3
1 files changed, 3 insertions, 0 deletions
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)
61 61
62static void nvgpu_init_timeout(struct gk20a *g) 62static void nvgpu_init_timeout(struct gk20a *g)
63{ 63{
64 struct gk20a_platform *platform = dev_get_drvdata(g->dev);
65
64 g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT; 66 g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT;
65 if (nvgpu_platform_is_silicon(g)) 67 if (nvgpu_platform_is_silicon(g))
66 g->timeouts_enabled = true; 68 g->timeouts_enabled = true;
@@ -68,6 +70,7 @@ static void nvgpu_init_timeout(struct gk20a *g)
68 g->gr_idle_timeout_default = GK20A_TIMEOUT_FPGA; 70 g->gr_idle_timeout_default = GK20A_TIMEOUT_FPGA;
69 g->timeouts_enabled = true; 71 g->timeouts_enabled = true;
70 } 72 }
73 g->ch_wdt_timeout_ms = platform->ch_wdt_timeout_ms;
71} 74}
72 75
73static void nvgpu_init_timeslice(struct gk20a *g) 76static void nvgpu_init_timeslice(struct gk20a *g)