nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Disable channel watchdog

Browse Source 
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>
This commit is contained in:
Terje Bergstrom
2016-06-13 08:50:41 -07:00
committed by Deepak Nibade
parent 768dc5ad42
commit edd080b05a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/gk20a/channel_gk20a.c
View File

@@ -1612,7 +1612,7 @@ static void gk20a_channel_timeout_start(struct channel_gk20a *ch,
{
struct gk20a_platform *platform = gk20a_get_platform(ch->g->dev);
if (!ch->g->timeouts_enabled || !platform->ch_wdt_timeout_ms)
if (!ch->g->timeouts_enabled || !platform->ch_wdt_enabled)
return;
if (!ch->wdt_enabled)

1
drivers/gpu/nvgpu/gk20a/platform_gk20a.h
View File

@@ -84,6 +84,7 @@ struct gk20a_platform {
bool enable_aelpg;
/* Timeout for per-channel watchdog (in mS) */
bool ch_wdt_enabled;
u32 ch_wdt_timeout_ms;
/* Enable SMMU bypass by default */