diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-13 11:50:41 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-06-14 07:50:48 -0400 |
commit | edd080b05ab118307c7c7b01426ea1e7c1cc9be7 (patch) | |
tree | b5f356c45612ae7ba013ea5e7f0805c7e703d3b7 /drivers/gpu/nvgpu | |
parent | 768dc5ad42c927c0a272f7d14b9e3ac0378378a6 (diff) |
gpu: nvgpu: Disable channel watchdog
Bug 200198908
Change-Id: I4dfb3517f5467f8b5449e65290453ba1c828243d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1163439
Tested-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 713c7737..b7081d06 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -1612,7 +1612,7 @@ static void gk20a_channel_timeout_start(struct channel_gk20a *ch, | |||
1612 | { | 1612 | { |
1613 | struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev); | 1613 | struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev); |
1614 | 1614 | ||
1615 | if (!ch->g->timeouts_enabled || !platform->ch_wdt_timeout_ms) | 1615 | if (!ch->g->timeouts_enabled || !platform->ch_wdt_enabled) |
1616 | return; | 1616 | return; |
1617 | 1617 | ||
1618 | if (!ch->wdt_enabled) | 1618 | if (!ch->wdt_enabled) |
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 66d97915..99a8286e 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -84,6 +84,7 @@ struct gk20a_platform { | |||
84 | bool enable_aelpg; | 84 | bool enable_aelpg; |
85 | 85 | ||
86 | /* Timeout for per-channel watchdog (in mS) */ | 86 | /* Timeout for per-channel watchdog (in mS) */ |
87 | bool ch_wdt_enabled; | ||
87 | u32 ch_wdt_timeout_ms; | 88 | u32 ch_wdt_timeout_ms; |
88 | 89 | ||
89 | /* Enable SMMU bypass by default */ | 90 | /* Enable SMMU bypass by default */ |