summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/linux/cde.c
diff options
context:
space:
mode:
authorKonsta Holtta <kholtta@nvidia.com>2018-06-14 02:57:24 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-06-15 15:45:37 -0400
commit1f51620fda57443c77506c354af837a60883d78b (patch)
tree256cbfd0645def370684bd9363d1f0b441c509c7 /drivers/gpu/nvgpu/common/linux/cde.c
parent52265164c87fec8c2802d575f179587a88cbd7e0 (diff)
gpu: nvgpu: disable watchdog for in-kernel CDE channels
The watchdog tracks wall clock time. If the GPU's runlist is heavily congested, other work can last long enough to trigger the watchdog for trusted kernel channels too. We don't expect the CDE work to ever get stuck, so disable wdt there. Bug 200311892 Change-Id: I58c7d23891bc73aaeea0ccfcead567b3c6c13a52 Signed-off-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1493814 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/cde.c')
-rw-r--r--drivers/gpu/nvgpu/common/linux/cde.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c
index 1ada0793..32b333f1 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.c
+++ b/drivers/gpu/nvgpu/common/linux/cde.c
@@ -1309,6 +1309,8 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx)
1309 goto err_get_gk20a_channel; 1309 goto err_get_gk20a_channel;
1310 } 1310 }
1311 1311
1312 ch->timeout.enabled = false;
1313
1312 /* bind the channel to the vm */ 1314 /* bind the channel to the vm */
1313 err = g->ops.mm.vm_bind_channel(g->mm.cde.vm, ch); 1315 err = g->ops.mm.vm_bind_channel(g->mm.cde.vm, ch);
1314 if (err) { 1316 if (err) {