From d7c78df466c487140af902b98f79ced367198e2d Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 3 Jul 2018 11:20:52 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1769627 Reviewed-by: Alex Waterman Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/mm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/include') 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 { struct nvgpu_mem bar2_desc; struct nvgpu_mem hw_fault_buf[FAULT_TYPE_NUM]; - struct mmu_fault_info *fault_info[FAULT_TYPE_NUM]; + struct mmu_fault_info fault_info[FAULT_TYPE_NUM]; struct nvgpu_mutex hub_isr_mutex; u32 hub_intr_types; -- cgit v1.2.2