diff options
author | Peter Daifuku <pdaifuku@nvidia.com> | 2016-06-03 18:29:57 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:56:18 -0500 |
commit | f61d819accfd90a8db59799f36f9ec97e97424f0 (patch) | |
tree | eabfa2b79e1e39e085e92b01e78d4d00fd26cb17 /drivers/gpu/nvgpu/gp10b | |
parent | a680bd05b15b9695000b04960e36873eb9e4c9d4 (diff) |
gpu: nvgpu: ppc register support
Fix support for ppc_in_gpc_base
Add support for ppc_in_gpc_shared_base
Bug 1771830
Change-Id: I1d04bfd20eac08a26986a2436524b97a008ed913
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: http://git-master/r/1158889
(cherry picked from commit 0f9ac2fd958556ee5d76d4cb2f6a335960227433)
Reviewed-on: http://git-master/r/1164398
(cherry picked from commit aa12f60061bdbeb68094d59258ac2db34f0cfe2a)
Reviewed-on: http://git-master/r/1181501
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index e44767a0..d82a03eb 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -138,9 +138,15 @@ static int gp10b_get_litter_value(struct gk20a *g, | |||
138 | case GPU_LIT_TPC_IN_GPC_SHARED_BASE: | 138 | case GPU_LIT_TPC_IN_GPC_SHARED_BASE: |
139 | ret = proj_tpc_in_gpc_shared_base_v(); | 139 | ret = proj_tpc_in_gpc_shared_base_v(); |
140 | break; | 140 | break; |
141 | case GPU_LIT_PPC_IN_GPC_BASE: | ||
142 | ret = proj_ppc_in_gpc_base_v(); | ||
143 | break; | ||
141 | case GPU_LIT_PPC_IN_GPC_STRIDE: | 144 | case GPU_LIT_PPC_IN_GPC_STRIDE: |
142 | ret = proj_ppc_in_gpc_stride_v(); | 145 | ret = proj_ppc_in_gpc_stride_v(); |
143 | break; | 146 | break; |
147 | case GPU_LIT_PPC_IN_GPC_SHARED_BASE: | ||
148 | ret = proj_ppc_in_gpc_shared_base_v(); | ||
149 | break; | ||
144 | case GPU_LIT_ROP_BASE: | 150 | case GPU_LIT_ROP_BASE: |
145 | ret = proj_rop_base_v(); | 151 | ret = proj_rop_base_v(); |
146 | break; | 152 | break; |
@@ -169,6 +175,8 @@ static int gp10b_get_litter_value(struct gk20a *g, | |||
169 | ret = proj_fbpa_stride_v(); | 175 | ret = proj_fbpa_stride_v(); |
170 | break; | 176 | break; |
171 | default: | 177 | default: |
178 | gk20a_err(dev_from_gk20a(g), "Missing definition %d", value); | ||
179 | BUG(); | ||
172 | break; | 180 | break; |
173 | } | 181 | } |
174 | 182 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h index d1a60c29..08a7cb82 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h | |||
@@ -78,6 +78,10 @@ static inline u32 proj_ppc_in_gpc_base_v(void) | |||
78 | { | 78 | { |
79 | return 0x00003000; | 79 | return 0x00003000; |
80 | } | 80 | } |
81 | static inline u32 proj_ppc_in_gpc_shared_base_v(void) | ||
82 | { | ||
83 | return 0x00003e00; | ||
84 | } | ||
81 | static inline u32 proj_ppc_in_gpc_stride_v(void) | 85 | static inline u32 proj_ppc_in_gpc_stride_v(void) |
82 | { | 86 | { |
83 | return 0x00000200; | 87 | return 0x00000200; |