From 632a86f7cdec9f795fdef56ad028694c72d4e9d4 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Wed, 25 Nov 2015 15:22:24 +0530 Subject: 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 Reviewed-on: http://git-master/r/837962 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gk20a.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c') 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) CONFIG_GK20A_DEFAULT_TIMEOUT; if (tegra_platform_is_silicon()) gk20a->timeouts_enabled = true; - gk20a->ch_wdt_enabled = true; gk20a->timeslice_low_priority_us = 1300; gk20a->timeslice_medium_priority_us = 2600; -- cgit v1.2.2