From 2ff3a9f374e6e7fb6c468789cf8e0213f2297bdf Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 3 Apr 2017 09:41:41 -0700 Subject: 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 Reviewed-by: mobile promotions Tested-by: mobile promotions --- 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 7cfcd154..ce76bfc3 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c @@ -460,7 +460,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); -- cgit v1.2.2