From 1557ee63edabe64c32226ce3f086dffbe2610c2a Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Mon, 26 Mar 2018 11:15:33 -0700 Subject: gpu: nvgpu: add accessor for gpc priv stride Re-generate headers for proj_gpc_priv_stride accessor. This is needed to compute priv error register offsets. Bug 2093058 Change-Id: Ied4e2b072f650940757c44e261b416d388e8924c Signed-off-by: Thomas Fleury Reviewed-on: https://git-master.nvidia.com/r/1682117 Reviewed-by: Seema Khowala GVS: Gerrit_Virtual_Submit Tested-by: Seema Khowala Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_proj_gk20a.h | 6 +++++- drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h | 6 +++++- drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h | 6 +++++- drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h | 6 +++++- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h | 6 +++++- drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_proj_gv11b.h | 6 +++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_proj_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_proj_gk20a.h index 5ef03f5a..10509ca4 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_proj_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_proj_gk20a.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2012-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -68,6 +68,10 @@ static inline u32 proj_gpc_stride_v(void) { return 0x00008000U; } +static inline u32 proj_gpc_priv_stride_v(void) +{ + return 0x00000800U; +} static inline u32 proj_ltc_stride_v(void) { return 0x00002000U; diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h index d44cc463..8129ea6d 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -68,6 +68,10 @@ static inline u32 proj_gpc_stride_v(void) { return 0x00008000U; } +static inline u32 proj_gpc_priv_stride_v(void) +{ + return 0x00000800U; +} static inline u32 proj_ltc_stride_v(void) { return 0x00002000U; diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h index be2111cc..866bc7b6 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -68,6 +68,10 @@ static inline u32 proj_gpc_stride_v(void) { return 0x00008000U; } +static inline u32 proj_gpc_priv_stride_v(void) +{ + return 0x00000800U; +} static inline u32 proj_ltc_stride_v(void) { return 0x00002000U; diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h index f5d60beb..a885e933 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -68,6 +68,10 @@ static inline u32 proj_gpc_stride_v(void) { return 0x00008000U; } +static inline u32 proj_gpc_priv_stride_v(void) +{ + return 0x00000800U; +} static inline u32 proj_ltc_stride_v(void) { return 0x00002000U; diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h index dc4c377d..f46eaa09 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_proj_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -68,6 +68,10 @@ static inline u32 proj_gpc_stride_v(void) { return 0x00008000U; } +static inline u32 proj_gpc_priv_stride_v(void) +{ + return 0x00000800U; +} static inline u32 proj_ltc_stride_v(void) { return 0x00002000U; diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_proj_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_proj_gv11b.h index 808fe316..72832377 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_proj_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_proj_gv11b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -68,6 +68,10 @@ static inline u32 proj_gpc_stride_v(void) { return 0x00008000U; } +static inline u32 proj_gpc_priv_stride_v(void) +{ + return 0x00000800U; +} static inline u32 proj_ltc_stride_v(void) { return 0x00002000U; -- cgit v1.2.2