diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2015-10-05 02:16:04 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-10-07 18:00:18 -0400 |
commit | ff417a72e29249402acf13eb597caced4900a491 (patch) | |
tree | 702d4ac58959eea0d6f33c2e94a81a23c1a576bf /drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |
parent | 488a2c38d17cd13b4453678d81c92db0664dd077 (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 7 |
1 files changed, 5 insertions, 2 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, | |||
1476 | 1476 | ||
1477 | static u32 gk20a_get_channel_watchdog_timeout(struct channel_gk20a *ch) | 1477 | static u32 gk20a_get_channel_watchdog_timeout(struct channel_gk20a *ch) |
1478 | { | 1478 | { |
1479 | if (ch->g->timeouts_enabled && ch->g->ch_wdt_enabled) | 1479 | struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev); |
1480 | return NVGPU_CHANNEL_WATCHDOG_DEFAULT_TIMEOUT_MS; | 1480 | |
1481 | if (ch->g->timeouts_enabled && ch->g->ch_wdt_enabled && | ||
1482 | platform->ch_wdt_timeout_ms) | ||
1483 | return platform->ch_wdt_timeout_ms; | ||
1481 | else | 1484 | else |
1482 | return (u32)MAX_SCHEDULE_TIMEOUT; | 1485 | return (u32)MAX_SCHEDULE_TIMEOUT; |
1483 | } | 1486 | } |