summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include/nvgpu/mm.h
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-07-03 14:20:52 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-07-06 00:49:00 -0400
commitd7c78df466c487140af902b98f79ced367198e2d (patch)
tree2c31600a00929030091e2ec3126084fc96121df5 /drivers/gpu/nvgpu/include/nvgpu/mm.h
parent26783b85bfee4c2ef4f2ccc2d16ebc783dd0aa7d (diff)
gpu: nvgpu: Combine the fault buffer deinit seqs
gv11b_mm_fault_info_mem_destroy() and gv11b_mm_mmu_hw_fault_buf_deinit() serve a similar purpose of disabling hub interrupts and deinitializing memory related to MMU fault handling. Out of the two the latter was called from BAR2 deinitialization, and the former from nvgpu_remove_mm_support(). Combine the functions and leave the call from nvgpu_remove_mm_support(). This way BAR2 deinitialization can be combined with gp10b version. JIRA NVGPU-714 Change-Id: I4050865eaba404b049c621ac2ce54c963e1aea44 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1769627 Reviewed-by: Alex Waterman <alexw@nvidia.com> Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include/nvgpu/mm.h')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/mm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/mm.h b/drivers/gpu/nvgpu/include/nvgpu/mm.h
index 3c9da601..ace22742 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/mm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/mm.h
@@ -129,7 +129,7 @@ struct mm_gk20a {
129 struct nvgpu_mem bar2_desc; 129 struct nvgpu_mem bar2_desc;
130 130
131 struct nvgpu_mem hw_fault_buf[FAULT_TYPE_NUM]; 131 struct nvgpu_mem hw_fault_buf[FAULT_TYPE_NUM];
132 struct mmu_fault_info *fault_info[FAULT_TYPE_NUM]; 132 struct mmu_fault_info fault_info[FAULT_TYPE_NUM];
133 struct nvgpu_mutex hub_isr_mutex; 133 struct nvgpu_mutex hub_isr_mutex;
134 u32 hub_intr_types; 134 u32 hub_intr_types;
135 135