gpu: nvgpu: make wdt timeout per-platform

Channel watchdog timeout is set to a costant value of 5s
as of now

Make this timeout platform specific and set it to 5s for gm20b
and 7s for gk20a

Bug 200133289

Change-Id: I6e7f0fed93a8d5b197ae46807131311196c6636f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/810956
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

4 files changed, 12 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 29fec4fe..e6a39b20 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -1476,8 +1476,11 @@ bool gk20a_channel_update_and_check_timeout(struct channel_gk20a *ch,
 
 static u32 gk20a_get_channel_watchdog_timeout(struct channel_gk20a *ch)
 {
-        if (ch->g->timeouts_enabled && ch->g->ch_wdt_enabled)
-                return NVGPU_CHANNEL_WATCHDOG_DEFAULT_TIMEOUT_MS;
+        struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev);
+
+        if (ch->g->timeouts_enabled && ch->g->ch_wdt_enabled &&
+                                platform->ch_wdt_timeout_ms)
+                return platform->ch_wdt_timeout_ms;
         else
                 return (u32)MAX_SCHEDULE_TIMEOUT;
 }
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index 9d74b412..20600207 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -38,8 +38,6 @@ struct gk20a_fence;
 #include "gr_gk20a.h"
 #include "fence_gk20a.h"
 
-#define NVGPU_CHANNEL_WATCHDOG_DEFAULT_TIMEOUT_MS       5000
-
 struct gpfifo {
         u32 entry0;
         u32 entry1;
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
index adacdb6b..0c3c6ff3 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
@@ -79,6 +79,9 @@ struct gk20a_platform {
         /* Adaptative ELPG: true = enable flase = disable */
         bool enable_aelpg;
 
+        /* Timeout for per-channel watchdog (in mS) */
+        u32 ch_wdt_timeout_ms;
+
         /* Enable SMMU bypass by default */
         bool bypass_smmu;
 
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
index 73e7303e..2c9cfb63 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
@@ -818,6 +818,8 @@ struct gk20a_platform gk20a_tegra_platform = {
 
         .default_big_page_size  = SZ_128K,
 
+        .ch_wdt_timeout_ms = 7000,
+
         .probe = gk20a_tegra_probe,
         .late_probe = gk20a_tegra_late_probe,
         .remove = gk20a_tegra_remove,
@@ -865,6 +867,8 @@ struct gk20a_platform gm20b_tegra_platform = {
 
         .default_big_page_size  = SZ_128K,
 
+        .ch_wdt_timeout_ms = 5000,
+
         .probe = gk20a_tegra_probe,
         .late_probe = gk20a_tegra_late_probe,
         .remove = gk20a_tegra_remove,