diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 713c77371..b7081d060 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_timeout_ms)
+	if (!ch->g->timeouts_enabled || !platform->ch_wdt_enabled)
 		return;
 
 	if (!ch->wdt_enabled)
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
index 66d97915b..99a8286ed 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
@@ -84,6 +84,7 @@ 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 */