diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2016-06-16 06:21:46 -0400 |
|---|---|---|
| committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-20 10:39:53 -0400 |
| commit | efb6113b65c4976cf718787b2adc64d495e8fd94 (patch) | |
| tree | 77d2821441d5235ba21ef058582deb13853750a8 /drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |
| parent | da907c76e2eb43124dcad8645a108e9223345af5 (diff) | |
Revert "gpu: nvgpu: Disable channel watchdog"
This reverts commit edd080b05ab118307c7c7b01426ea1e7c1cc9be7.
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>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/platform_gk20a.h')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 99a8286e..66d97915 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
| @@ -84,7 +84,6 @@ 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; | ||
| 88 | u32 ch_wdt_timeout_ms; | 87 | u32 ch_wdt_timeout_ms; |
| 89 | 88 | ||
| 90 | /* Enable SMMU bypass by default */ | 89 | /* Enable SMMU bypass by default */ |