summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
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.c
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.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 79218c97..9bbc9bd8 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1436,7 +1436,6 @@ static int gk20a_probe(struct platform_device *dev)
1436 CONFIG_GK20A_DEFAULT_TIMEOUT; 1436 CONFIG_GK20A_DEFAULT_TIMEOUT;
1437 if (tegra_platform_is_silicon()) 1437 if (tegra_platform_is_silicon())
1438 gk20a->timeouts_enabled = true; 1438 gk20a->timeouts_enabled = true;
1439 gk20a->ch_wdt_enabled = true;
1440 1439
1441 gk20a->timeslice_low_priority_us = 1300; 1440 gk20a->timeslice_low_priority_us = 1300;
1442 gk20a->timeslice_medium_priority_us = 2600; 1441 gk20a->timeslice_medium_priority_us = 2600;