summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.h
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2015-11-25 04:52:24 -0500
committerTerje Bergstrom <tbergstrom@nvidia.com>2015-11-30 11:48:59 -0500
commit632a86f7cdec9f795fdef56ad028694c72d4e9d4 (patch)
treef3effaac4d6347614154d1c483eceaa3c0480647 /drivers/gpu/nvgpu/gk20a/gk20a.h
parentc45f8cadee552001ac6881ef570730055a98a7c5 (diff)
gpu: nvgpu: IOCTL to disable watchdog per-channel
Add IOCTL NVGPU_IOCTL_CHANNEL_WDT to disable/enable watchdog per-channel Also, if watchdog is disabled, we currently schedule the worker with MAX timeout. Instead of this, do not schedule any worker if watchdog is disabled Bug 1683059 Bug 1700277 Change-Id: I7f6bec84adeedb74e014ed6d1471317b854df84c Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/837962 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index fe51f356..51955a3a 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -499,7 +499,6 @@ struct gk20a {
499 u32 gr_idle_timeout_default; 499 u32 gr_idle_timeout_default;
500 u32 timeouts_enabled; 500 u32 timeouts_enabled;
501 501
502 u32 ch_wdt_enabled;
503 struct mutex ch_wdt_lock; 502 struct mutex ch_wdt_lock;
504 503
505 /* Channel priorities */ 504 /* Channel priorities */