diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-10-27 03:16:51 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:52 -0400 |
commit | 4739499f07b29282ee1031d08adaa76c238da2a6 (patch) | |
tree | 10caa152eea6250e46cad6172553069b4bb3dcb9 /drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h | |
parent | b5bb4f53dbdde8473e1160d4522c5d9da55f115f (diff) |
gpu: nvgpu: Sync gk20a and gm20b headers
Synchronize gk20a and gm20b headers. All registers which were added
to gk20a are now added to gm20b, and some registers that are unused
are removed.
Bug 1567274
Change-Id: Ia3b7958c148e495cbff420ee56bb448db0f58680
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/590313
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h | 68 |
1 files changed, 64 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h index 01161f17..8783a0bc 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h | |||
@@ -90,13 +90,25 @@ static inline u32 ctxsw_prog_main_image_pm_o(void) | |||
90 | { | 90 | { |
91 | return 0x00000028; | 91 | return 0x00000028; |
92 | } | 92 | } |
93 | static inline u32 ctxsw_prog_main_image_pm_mode_v(u32 r) | 93 | static inline u32 ctxsw_prog_main_image_pm_mode_m(void) |
94 | { | 94 | { |
95 | return (r >> 0) & 0x7; | 95 | return 0x7 << 0; |
96 | } | 96 | } |
97 | static inline u32 ctxsw_prog_main_image_pm_mode_no_ctxsw_v(void) | 97 | static inline u32 ctxsw_prog_main_image_pm_mode_no_ctxsw_f(void) |
98 | { | 98 | { |
99 | return 0x00000000; | 99 | return 0x0; |
100 | } | ||
101 | static inline u32 ctxsw_prog_main_image_pm_smpc_mode_m(void) | ||
102 | { | ||
103 | return 0x7 << 3; | ||
104 | } | ||
105 | static inline u32 ctxsw_prog_main_image_pm_smpc_mode_ctxsw_f(void) | ||
106 | { | ||
107 | return 0x8; | ||
108 | } | ||
109 | static inline u32 ctxsw_prog_main_image_pm_smpc_mode_no_ctxsw_f(void) | ||
110 | { | ||
111 | return 0x0; | ||
100 | } | 112 | } |
101 | static inline u32 ctxsw_prog_main_image_pm_ptr_o(void) | 113 | static inline u32 ctxsw_prog_main_image_pm_ptr_o(void) |
102 | { | 114 | { |
@@ -178,4 +190,52 @@ static inline u32 ctxsw_prog_extended_sm_dsm_perf_counter_control_register_strid | |||
178 | { | 190 | { |
179 | return 0x00000002; | 191 | return 0x00000002; |
180 | } | 192 | } |
193 | static inline u32 ctxsw_prog_main_image_priv_access_map_config_o(void) | ||
194 | { | ||
195 | return 0x000000a0; | ||
196 | } | ||
197 | static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_s(void) | ||
198 | { | ||
199 | return 2; | ||
200 | } | ||
201 | static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_f(u32 v) | ||
202 | { | ||
203 | return (v & 0x3) << 0; | ||
204 | } | ||
205 | static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_m(void) | ||
206 | { | ||
207 | return 0x3 << 0; | ||
208 | } | ||
209 | static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_v(u32 r) | ||
210 | { | ||
211 | return (r >> 0) & 0x3; | ||
212 | } | ||
213 | static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_allow_all_f(void) | ||
214 | { | ||
215 | return 0x0; | ||
216 | } | ||
217 | static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_use_map_f(void) | ||
218 | { | ||
219 | return 0x2; | ||
220 | } | ||
221 | static inline u32 ctxsw_prog_main_image_priv_access_map_addr_lo_o(void) | ||
222 | { | ||
223 | return 0x000000a4; | ||
224 | } | ||
225 | static inline u32 ctxsw_prog_main_image_priv_access_map_addr_hi_o(void) | ||
226 | { | ||
227 | return 0x000000a8; | ||
228 | } | ||
229 | static inline u32 ctxsw_prog_main_image_misc_options_o(void) | ||
230 | { | ||
231 | return 0x0000003c; | ||
232 | } | ||
233 | static inline u32 ctxsw_prog_main_image_misc_options_verif_features_m(void) | ||
234 | { | ||
235 | return 0x1 << 3; | ||
236 | } | ||
237 | static inline u32 ctxsw_prog_main_image_misc_options_verif_features_disabled_f(void) | ||
238 | { | ||
239 | return 0x0; | ||
240 | } | ||
181 | #endif | 241 | #endif |