summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorSeema Khowala <seemaj@nvidia.com>2017-05-22 13:39:52 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-05-30 14:04:05 -0400
commitc3192b5acc03bf4e65aa1cbefb3a9ea88d87d9bd (patch)
tree8b28808f3b90ea54981153d42e640133f0ce0e1b /drivers/gpu/nvgpu/include
parente8f4e52efe6bfd019c8be5de6ebf07f56463d562 (diff)
gpu: nvgpu: use mmu_fault_info struct for legacy gpu chips
Removed fifo_mmu_fault_info_gk20a struct to use new mmu_fault_info struct JIRA GPUT19X-7 JIRA GPUT19X-12 Change-Id: I1987ff1b07e7dbdbee58d7e5f585faacf4846e54 Signed-off-by: Seema Khowala <seemaj@nvidia.com> Reviewed-on: http://git-master/r/1487240 Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fifo_gk20a.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fifo_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fifo_gk20a.h
index 4d54c89f..cdecfec7 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fifo_gk20a.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2012-2016, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2012-2017, NVIDIA CORPORATION. All rights reserved.
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify it 4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms and conditions of the GNU General Public License, 5 * under the terms and conditions of the GNU General Public License,
@@ -338,6 +338,10 @@ static inline u32 fifo_intr_mmu_fault_info_type_v(u32 r)
338{ 338{
339 return (r >> 0) & 0xf; 339 return (r >> 0) & 0xf;
340} 340}
341static inline u32 fifo_intr_mmu_fault_info_write_v(u32 r)
342{
343 return (r >> 7) & 0x1;
344}
341static inline u32 fifo_intr_mmu_fault_info_engine_subid_v(u32 r) 345static inline u32 fifo_intr_mmu_fault_info_engine_subid_v(u32 r)
342{ 346{
343 return (r >> 6) & 0x1; 347 return (r >> 6) & 0x1;