summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorSeema Khowala <seemaj@nvidia.com>2019-02-14 16:36:19 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2019-05-02 05:43:02 -0400
commitef69df6dae3dd21f10b035e687381a578344e417 (patch)
tree0cb1571076dcb6219e48e043976cc90bd95bd776 /drivers/gpu/nvgpu/include
parent9bde6f8950c7f19f60d1e907e2458b965d35b8ff (diff)
gpu: nvgpu: add hal to mask/unmask intr during teardown
ctxsw timeout error prevents recovery as it can get triggered periodically. Disable ctxsw timeout interrupt to allow recovery. Bug 2092051 Bug 2429295 Bug 2484211 Bug 1890287 Change-Id: I47470e13968d8b26cdaf519b62fd510bc7ea05d9 Signed-off-by: Seema Khowala <seemaj@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/2019645 Signed-off-by: Debarshi Dutta <ddutta@nvidia.com> (cherry picked from commit 68c13e2f0447118d7391807c9b9269749d09a4ec in dev-kernel) Reviewed-on: https://git-master.nvidia.com/r/2024899 GVS: Gerrit_Virtual_Submit Reviewed-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/gk20a.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index aa435638..81a4e7b8 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -718,6 +718,8 @@ struct gpu_ops {
718 void (*teardown_ch_tsg)(struct gk20a *g, u32 act_eng_bitmask, 718 void (*teardown_ch_tsg)(struct gk20a *g, u32 act_eng_bitmask,
719 u32 id, unsigned int id_type, unsigned int rc_type, 719 u32 id, unsigned int id_type, unsigned int rc_type,
720 struct mmu_fault_info *mmfault); 720 struct mmu_fault_info *mmfault);
721 void (*teardown_mask_intr)(struct gk20a *g);
722 void (*teardown_unmask_intr)(struct gk20a *g);
721 bool (*handle_sched_error)(struct gk20a *g); 723 bool (*handle_sched_error)(struct gk20a *g);
722 bool (*handle_ctxsw_timeout)(struct gk20a *g, u32 fifo_intr); 724 bool (*handle_ctxsw_timeout)(struct gk20a *g, u32 fifo_intr);
723 unsigned int (*handle_pbdma_intr_0)(struct gk20a *g, 725 unsigned int (*handle_pbdma_intr_0)(struct gk20a *g,