From efb6113b65c4976cf718787b2adc64d495e8fd94 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Thu, 16 Jun 2016 15:51:46 +0530 Subject: 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 Reviewed-on: http://git-master/r/1165746 GVS: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 +- drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 45cf087a..fc1edd99 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c @@ -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) 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 { bool enable_aelpg; /* Timeout for per-channel watchdog (in mS) */ - bool ch_wdt_enabled; u32 ch_wdt_timeout_ms; /* Enable SMMU bypass by default */ -- cgit v1.2.2