diff options
Diffstat (limited to 'drivers')
7 files changed, 30 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fb_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fb_gm20b.h index 706142da..d80dc59d 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fb_gm20b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fb_gm20b.h | |||
@@ -344,4 +344,8 @@ static inline u32 fb_mmu_wpr_info_index_wpr2_addr_hi_v(void) | |||
344 | { | 344 | { |
345 | return 0x00000005; | 345 | return 0x00000005; |
346 | } | 346 | } |
347 | static inline u32 fb_niso_flush_sysmem_addr_r(void) | ||
348 | { | ||
349 | return 0x00100c10; | ||
350 | } | ||
347 | #endif | 351 | #endif |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fifo_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fifo_gm20b.h index 5f65d214..bfa9cc5b 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fifo_gm20b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fifo_gm20b.h | |||
@@ -304,6 +304,10 @@ static inline u32 fifo_intr_mmu_fault_info_type_v(u32 r) | |||
304 | { | 304 | { |
305 | return (r >> 0) & 0xf; | 305 | return (r >> 0) & 0xf; |
306 | } | 306 | } |
307 | static inline u32 fifo_intr_mmu_fault_info_write_v(u32 r) | ||
308 | { | ||
309 | return (r >> 7) & 0x1; | ||
310 | } | ||
307 | static inline u32 fifo_intr_mmu_fault_info_engine_subid_v(u32 r) | 311 | static inline u32 fifo_intr_mmu_fault_info_engine_subid_v(u32 r) |
308 | { | 312 | { |
309 | return (r >> 6) & 0x1; | 313 | return (r >> 6) & 0x1; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fuse_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fuse_gm20b.h index 217ab60b..eea44046 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fuse_gm20b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_fuse_gm20b.h | |||
@@ -130,7 +130,7 @@ static inline u32 fuse_status_opt_fbp_r(void) | |||
130 | } | 130 | } |
131 | static inline u32 fuse_status_opt_fbp_idx_v(u32 r, u32 i) | 131 | static inline u32 fuse_status_opt_fbp_idx_v(u32 r, u32 i) |
132 | { | 132 | { |
133 | return (r >> (0 + i*0)) & 0x1; | 133 | return (r >> (0 + i*1)) & 0x1; |
134 | } | 134 | } |
135 | static inline u32 fuse_opt_sec_debug_en_r(void) | 135 | static inline u32 fuse_opt_sec_debug_en_r(void) |
136 | { | 136 | { |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gmmu_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gmmu_gm20b.h index 4d4dad16..7cbecaca 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gmmu_gm20b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gmmu_gm20b.h | |||
@@ -188,6 +188,14 @@ static inline u32 gmmu_pte_address_sys_w(void) | |||
188 | { | 188 | { |
189 | return 0; | 189 | return 0; |
190 | } | 190 | } |
191 | static inline u32 gmmu_pte_address_vid_f(u32 v) | ||
192 | { | ||
193 | return (v & 0x1ffffff) << 4; | ||
194 | } | ||
195 | static inline u32 gmmu_pte_address_vid_w(void) | ||
196 | { | ||
197 | return 0; | ||
198 | } | ||
191 | static inline u32 gmmu_pte_vol_w(void) | 199 | static inline u32 gmmu_pte_vol_w(void) |
192 | { | 200 | { |
193 | return 1; | 201 | return 1; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h index 18beb49b..763e04e3 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h | |||
@@ -180,6 +180,10 @@ static inline u32 gr_exception_ds_m(void) | |||
180 | { | 180 | { |
181 | return 0x1 << 4; | 181 | return 0x1 << 4; |
182 | } | 182 | } |
183 | static inline u32 gr_exception_sked_m(void) | ||
184 | { | ||
185 | return 0x1 << 8; | ||
186 | } | ||
183 | static inline u32 gr_exception1_r(void) | 187 | static inline u32 gr_exception1_r(void) |
184 | { | 188 | { |
185 | return 0x00400118; | 189 | return 0x00400118; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_trim_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_trim_gp106.h index a630f967..53bf9e0b 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_trim_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_trim_gp106.h | |||
@@ -55,6 +55,7 @@ | |||
55 | */ | 55 | */ |
56 | #ifndef _hw_trim_gp106_h_ | 56 | #ifndef _hw_trim_gp106_h_ |
57 | #define _hw_trim_gp106_h_ | 57 | #define _hw_trim_gp106_h_ |
58 | |||
58 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_r(void) | 59 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_r(void) |
59 | { | 60 | { |
60 | return 0x00132924; | 61 | return 0x00132924; |
@@ -93,7 +94,7 @@ static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_write_en_v(u32 r) | |||
93 | } | 94 | } |
94 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_write_en_deasserted_f(void) | 95 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_write_en_deasserted_f(void) |
95 | { | 96 | { |
96 | return 0; | 97 | return 0x0; |
97 | } | 98 | } |
98 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_write_en_asserted_f(void) | 99 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_write_en_asserted_f(void) |
99 | { | 100 | { |
@@ -117,7 +118,7 @@ static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_enable_v(u32 r) | |||
117 | } | 118 | } |
118 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_enable_deasserted_f(void) | 119 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_enable_deasserted_f(void) |
119 | { | 120 | { |
120 | return 0; | 121 | return 0x0; |
121 | } | 122 | } |
122 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_enable_asserted_f(void) | 123 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_enable_asserted_f(void) |
123 | { | 124 | { |
@@ -141,7 +142,7 @@ static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_reset_v(u32 r) | |||
141 | } | 142 | } |
142 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_reset_deasserted_f(void) | 143 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_reset_deasserted_f(void) |
143 | { | 144 | { |
144 | return 0; | 145 | return 0x0; |
145 | } | 146 | } |
146 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_reset_asserted_f(void) | 147 | static inline u32 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_reset_asserted_f(void) |
147 | { | 148 | { |
@@ -161,7 +162,7 @@ static inline u32 trim_fbpa_bcast_clk_cntr_ncltcclk_cfg_r(void) | |||
161 | } | 162 | } |
162 | static inline u32 trim_fbpa_bcast_clk_cntr_ncltcclk_cfg_source_dramdiv4_rec_clk1_f(void) | 163 | static inline u32 trim_fbpa_bcast_clk_cntr_ncltcclk_cfg_source_dramdiv4_rec_clk1_f(void) |
163 | { | 164 | { |
164 | return 0x20000000; | 165 | return 0x30000000; |
165 | } | 166 | } |
166 | static inline u32 trim_fbpa_bcast_clk_cntr_ncltcclk_cnt_r(void) | 167 | static inline u32 trim_fbpa_bcast_clk_cntr_ncltcclk_cnt_r(void) |
167 | { | 168 | { |
@@ -191,5 +192,4 @@ static inline u32 trim_sys_clk_cntr_ncsyspll_cnt_r(void) | |||
191 | { | 192 | { |
192 | return 0x001373b4; | 193 | return 0x001373b4; |
193 | } | 194 | } |
194 | |||
195 | #endif | 195 | #endif |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xve_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xve_gp106.h index 3edd4dac..78a705f5 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xve_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xve_gp106.h | |||
@@ -152,6 +152,10 @@ static inline u32 xve_priv_xv_cya_l1_enable_v(u32 r) | |||
152 | { | 152 | { |
153 | return (r >> 8) & 0x1; | 153 | return (r >> 8) & 0x1; |
154 | } | 154 | } |
155 | static inline u32 xve_cya_2_r(void) | ||
156 | { | ||
157 | return 0x00000704; | ||
158 | } | ||
155 | static inline u32 xve_reset_r(void) | 159 | static inline u32 xve_reset_r(void) |
156 | { | 160 | { |
157 | return 0x00000718; | 161 | return 0x00000718; |
@@ -200,9 +204,4 @@ static inline u32 xve_reset_clock_counter_val_v(u32 r) | |||
200 | { | 204 | { |
201 | return (r >> 17) & 0x7ff; | 205 | return (r >> 17) & 0x7ff; |
202 | } | 206 | } |
203 | static inline u32 xve_cya_2_r(void) | ||
204 | { | ||
205 | return 0x00000704; | ||
206 | } | ||
207 | |||
208 | #endif | 207 | #endif |