diff options
author | Peter Daifuku <pdaifuku@nvidia.com> | 2016-11-03 19:14:05 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:56:51 -0500 |
commit | 06a03fba267ce34c3a601941f25476ae937da1fc (patch) | |
tree | 603e19ce85bfe4b154c282296871f5b656b8ec8e | |
parent | 294e2520d5b2fd8225935b30403cfd59018dd525 (diff) |
gpu: nvgpu: add FBPA base addresses
Add FBPA base addresses
Bug 200249125
Change-Id: I235fa12a00ef2c5b2f0415bb18755523e8a2754b
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
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 <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hw_proj_gp106.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h | 8 |
4 files changed, 28 insertions, 0 deletions
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) | |||
169 | case GPU_LIT_NUM_FBPAS: | 169 | case GPU_LIT_NUM_FBPAS: |
170 | ret = proj_scal_litter_num_fbpas_v(); | 170 | ret = proj_scal_litter_num_fbpas_v(); |
171 | break; | 171 | break; |
172 | case GPU_LIT_FBPA_SHARED_BASE: | ||
173 | ret = proj_fbpa_shared_base_v(); | ||
174 | break; | ||
175 | case GPU_LIT_FBPA_BASE: | ||
176 | ret = proj_fbpa_base_v(); | ||
177 | break; | ||
172 | case GPU_LIT_FBPA_STRIDE: | 178 | case GPU_LIT_FBPA_STRIDE: |
173 | ret = proj_fbpa_stride_v(); | 179 | ret = proj_fbpa_stride_v(); |
174 | break; | 180 | 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) | |||
70 | { | 70 | { |
71 | return 0x00000200; | 71 | return 0x00000200; |
72 | } | 72 | } |
73 | static inline u32 proj_fbpa_base_v(void) | ||
74 | { | ||
75 | return 0x00900000; | ||
76 | } | ||
77 | static inline u32 proj_fbpa_shared_base_v(void) | ||
78 | { | ||
79 | return 0x009a0000; | ||
80 | } | ||
73 | static inline u32 proj_fbpa_stride_v(void) | 81 | static inline u32 proj_fbpa_stride_v(void) |
74 | { | 82 | { |
75 | return 0x00004000; | 83 | 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) | |||
178 | case GPU_LIT_FBPA_STRIDE: | 178 | case GPU_LIT_FBPA_STRIDE: |
179 | ret = proj_fbpa_stride_v(); | 179 | ret = proj_fbpa_stride_v(); |
180 | break; | 180 | break; |
181 | case GPU_LIT_FBPA_BASE: | ||
182 | ret = proj_fbpa_base_v(); | ||
183 | break; | ||
184 | case GPU_LIT_FBPA_SHARED_BASE: | ||
185 | ret = proj_fbpa_shared_base_v(); | ||
186 | break; | ||
181 | default: | 187 | default: |
182 | gk20a_err(dev_from_gk20a(g), "Missing definition %d", value); | 188 | gk20a_err(dev_from_gk20a(g), "Missing definition %d", value); |
183 | BUG(); | 189 | 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) | |||
70 | { | 70 | { |
71 | return 0x00000200; | 71 | return 0x00000200; |
72 | } | 72 | } |
73 | static inline u32 proj_fbpa_base_v(void) | ||
74 | { | ||
75 | return 0x00900000; | ||
76 | } | ||
77 | static inline u32 proj_fbpa_shared_base_v(void) | ||
78 | { | ||
79 | return 0x009a0000; | ||
80 | } | ||
73 | static inline u32 proj_fbpa_stride_v(void) | 81 | static inline u32 proj_fbpa_stride_v(void) |
74 | { | 82 | { |
75 | return 0x00004000; | 83 | return 0x00004000; |