diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-03 12:41:41 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-06 13:57:33 -0400 |
commit | 2ff3a9f374e6e7fb6c468789cf8e0213f2297bdf (patch) | |
tree | a21a06562bd63ca1ffdf323c39d9773073159c4c /drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | |
parent | ce3c30f14f1eed9ace2028b48c7e8f6cdd6b65cb (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1454208
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ce2_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, | |||
460 | if (!ce_ctx->ch) { | 460 | if (!ce_ctx->ch) { |
461 | gk20a_err(ce_ctx->dev, "ce: gk20a channel not available"); | 461 | gk20a_err(ce_ctx->dev, "ce: gk20a channel not available"); |
462 | goto end; | 462 | goto end; |
463 | } | 463 | } |
464 | ce_ctx->ch->wdt_enabled = false; | ||
464 | 465 | ||
465 | /* bind the channel to the vm */ | 466 | /* bind the channel to the vm */ |
466 | err = __gk20a_vm_bind_channel(&g->mm.ce.vm, ce_ctx->ch); | 467 | err = __gk20a_vm_bind_channel(&g->mm.ce.vm, ce_ctx->ch); |