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

Revert "gpu: nvgpu: Disable channel watchdog"

Browse Source 
This reverts commit edd080b05a.

Re-enable the watchdog since power management races
are now resolved

Bug 200198908

Change-Id: I74b97e564583aaedd858bc968adcfcaa275ea739
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1165746
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Deepak Nibade
2016-06-16 15:51:46 +05:30
committed by Terje Bergstrom
parent da907c76e2
commit efb6113b65
2 changed files with 1 additions and 2 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_enabled)
if (!ch->g->timeouts_enabled || !platform->ch_wdt_timeout_ms)
return;
if (!ch->wdt_enabled)

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

@@ -84,7 +84,6 @@ 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 */