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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1473705
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

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)
 
 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)