From 06a03fba267ce34c3a601941f25476ae937da1fc Mon Sep 17 00:00:00 2001 From: Peter Daifuku Date: Thu, 3 Nov 2016 16:14:05 -0700 Subject: gpu: nvgpu: add FBPA base addresses Add FBPA base addresses Bug 200249125 Change-Id: I235fa12a00ef2c5b2f0415bb18755523e8a2754b Signed-off-by: Peter Daifuku Reviewed-on: http://git-master/r/1247802 (cherry picked from commit d2c73ee989d3abeae305ff68ab355772c5e0af5a) Reviewed-on: http://git-master/r/1252163 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp106/hal_gp106.c | 6 ++++++ drivers/gpu/nvgpu/gp106/hw_proj_gp106.h | 8 ++++++++ drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 6 ++++++ drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h | 8 ++++++++ 4 files changed, 28 insertions(+) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index cdac76b7..0f926be8 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -169,6 +169,12 @@ static int gp106_get_litter_value(struct gk20a *g, int value) case GPU_LIT_NUM_FBPAS: ret = proj_scal_litter_num_fbpas_v(); break; + case GPU_LIT_FBPA_SHARED_BASE: + ret = proj_fbpa_shared_base_v(); + break; + case GPU_LIT_FBPA_BASE: + ret = proj_fbpa_base_v(); + break; case GPU_LIT_FBPA_STRIDE: ret = proj_fbpa_stride_v(); break; diff --git a/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h b/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h index 0063712f..8042bcae 100644 --- a/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h +++ b/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h @@ -70,6 +70,14 @@ static inline u32 proj_lts_stride_v(void) { return 0x00000200; } +static inline u32 proj_fbpa_base_v(void) +{ + return 0x00900000; +} +static inline u32 proj_fbpa_shared_base_v(void) +{ + return 0x009a0000; +} static inline u32 proj_fbpa_stride_v(void) { return 0x00004000; diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index e9385db0..b92bdfe2 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -178,6 +178,12 @@ static int gp10b_get_litter_value(struct gk20a *g, int value) case GPU_LIT_FBPA_STRIDE: ret = proj_fbpa_stride_v(); break; + case GPU_LIT_FBPA_BASE: + ret = proj_fbpa_base_v(); + break; + case GPU_LIT_FBPA_SHARED_BASE: + ret = proj_fbpa_shared_base_v(); + break; default: gk20a_err(dev_from_gk20a(g), "Missing definition %d", value); BUG(); diff --git a/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h index 08a7cb82..3392242c 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h @@ -70,6 +70,14 @@ static inline u32 proj_lts_stride_v(void) { return 0x00000200; } +static inline u32 proj_fbpa_base_v(void) +{ + return 0x00900000; +} +static inline u32 proj_fbpa_shared_base_v(void) +{ + return 0x009a0000; +} static inline u32 proj_fbpa_stride_v(void) { return 0x00004000; -- cgit v1.2.2