From 98a7cc5831e8127d1387fad535bc91ab1175a407 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 3 Apr 2017 09:41:41 -0700 Subject: [PATCH] gpu: nvgpu: Disable watchdog for in-kernel CE channels Getting a timeout on kernel's own CE channels is unrecoverable. Vidmem freeing also depends on CE to clear pages that have been used so that they can be reused. Disable watchdog on kernel's CE channels. Bug 200287270 Change-Id: I87e0aa925d6d20485a5a19d2a6bfd050de34e968 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1454208 (cherry picked from commit 2ff3a9f374e6e7fb6c468789cf8e0213f2297bdf) Reviewed-on: http://git-master/r/1457402 GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index f9b3c7eb9..7e85cfaaf 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c @@ -450,7 +450,8 @@ u32 gk20a_ce_create_context_with_cb(struct device *dev, if (!ce_ctx->ch) { gk20a_err(ce_ctx->dev, "ce: gk20a channel not available"); goto end; - } + } + ce_ctx->ch->wdt_enabled = false; /* bind the channel to the vm */ err = __gk20a_vm_bind_channel(&g->mm.ce.vm, ce_ctx->ch);