diff options
author | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2016-04-18 15:41:06 -0400 |
---|---|---|
committer | Ken Adams <kadams@nvidia.com> | 2016-04-19 11:56:13 -0400 |
commit | 4f2b0494e40c33ced3049211508ee50f75b723ea (patch) | |
tree | 2fcb3a0787ca93f80bdaf5facb2bbfe46acf3635 /drivers | |
parent | 66f64c86a838bb9bfec049e3676debd8998e8b08 (diff) |
gpu: nvgpu: gv11b: sysmem aperture for soc memory
In gv11b, soc memory needs to be accessed as sysmem instead of videmem.
Bug 1749338
Change-Id: I325c107958229cf717b0b0f18dd123597d1d7567
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/1128377
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ken Adams <kadams@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hw_bus_gv11b.h | 16 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hw_ccsr_gv11b.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hw_fb_gv11b.h | 20 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hw_pbdma_gv11b.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hw_ram_gv11b.h | 8 |
7 files changed, 76 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/hw_bus_gv11b.h b/drivers/gpu/nvgpu/gv11b/hw_bus_gv11b.h index 730fb0a7..cb5d2dc0 100644 --- a/drivers/gpu/nvgpu/gv11b/hw_bus_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/hw_bus_gv11b.h | |||
@@ -62,6 +62,14 @@ static inline u32 bus_bar1_block_target_vid_mem_f(void) | |||
62 | { | 62 | { |
63 | return 0x0; | 63 | return 0x0; |
64 | } | 64 | } |
65 | static inline u32 bus_bar1_block_target_sys_mem_coh_f(void) | ||
66 | { | ||
67 | return 0x20000000; | ||
68 | } | ||
69 | static inline u32 bus_bar1_block_target_sys_mem_ncoh_f(void) | ||
70 | { | ||
71 | return 0x30000000; | ||
72 | } | ||
65 | static inline u32 bus_bar1_block_mode_virtual_f(void) | 73 | static inline u32 bus_bar1_block_mode_virtual_f(void) |
66 | { | 74 | { |
67 | return 0x80000000; | 75 | return 0x80000000; |
@@ -78,6 +86,14 @@ static inline u32 bus_bar2_block_target_vid_mem_f(void) | |||
78 | { | 86 | { |
79 | return 0x0; | 87 | return 0x0; |
80 | } | 88 | } |
89 | static inline u32 bus_bar2_block_target_sys_mem_coh_f(void) | ||
90 | { | ||
91 | return 0x20000000; | ||
92 | } | ||
93 | static inline u32 bus_bar2_block_target_sys_mem_ncoh_f(void) | ||
94 | { | ||
95 | return 0x30000000; | ||
96 | } | ||
81 | static inline u32 bus_bar2_block_mode_virtual_f(void) | 97 | static inline u32 bus_bar2_block_mode_virtual_f(void) |
82 | { | 98 | { |
83 | return 0x80000000; | 99 | return 0x80000000; |
diff --git a/drivers/gpu/nvgpu/gv11b/hw_ccsr_gv11b.h b/drivers/gpu/nvgpu/gv11b/hw_ccsr_gv11b.h index 29df4bdd..04055b8c 100644 --- a/drivers/gpu/nvgpu/gv11b/hw_ccsr_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/hw_ccsr_gv11b.h | |||
@@ -66,6 +66,14 @@ static inline u32 ccsr_channel_inst_target_vid_mem_f(void) | |||
66 | { | 66 | { |
67 | return 0x0; | 67 | return 0x0; |
68 | } | 68 | } |
69 | static inline u32 ccsr_channel_inst_target_sys_mem_coh_f(void) | ||
70 | { | ||
71 | return 0x20000000; | ||
72 | } | ||
73 | static inline u32 ccsr_channel_inst_target_sys_mem_ncoh_f(void) | ||
74 | { | ||
75 | return 0x30000000; | ||
76 | } | ||
69 | static inline u32 ccsr_channel_inst_bind_false_f(void) | 77 | static inline u32 ccsr_channel_inst_bind_false_f(void) |
70 | { | 78 | { |
71 | return 0x0; | 79 | return 0x0; |
diff --git a/drivers/gpu/nvgpu/gv11b/hw_fb_gv11b.h b/drivers/gpu/nvgpu/gv11b/hw_fb_gv11b.h index 7537f749..0a5622b4 100644 --- a/drivers/gpu/nvgpu/gv11b/hw_fb_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/hw_fb_gv11b.h | |||
@@ -106,6 +106,10 @@ static inline u32 fb_mmu_invalidate_pdb_aperture_vid_mem_f(void) | |||
106 | { | 106 | { |
107 | return 0x0; | 107 | return 0x0; |
108 | } | 108 | } |
109 | static inline u32 fb_mmu_invalidate_pdb_aperture_sys_mem_f(void) | ||
110 | { | ||
111 | return 0x2; | ||
112 | } | ||
109 | static inline u32 fb_mmu_invalidate_pdb_addr_f(u32 v) | 113 | static inline u32 fb_mmu_invalidate_pdb_addr_f(u32 v) |
110 | { | 114 | { |
111 | return (v & 0xfffffff) << 4; | 115 | return (v & 0xfffffff) << 4; |
@@ -374,6 +378,14 @@ static inline u32 fb_mmu_debug_wr_aperture_vid_mem_f(void) | |||
374 | { | 378 | { |
375 | return 0x0; | 379 | return 0x0; |
376 | } | 380 | } |
381 | static inline u32 fb_mmu_debug_wr_aperture_sys_mem_coh_f(void) | ||
382 | { | ||
383 | return 0x2; | ||
384 | } | ||
385 | static inline u32 fb_mmu_debug_wr_aperture_sys_mem_ncoh_f(void) | ||
386 | { | ||
387 | return 0x3; | ||
388 | } | ||
377 | static inline u32 fb_mmu_debug_wr_vol_false_f(void) | 389 | static inline u32 fb_mmu_debug_wr_vol_false_f(void) |
378 | { | 390 | { |
379 | return 0x0; | 391 | return 0x0; |
@@ -402,6 +414,14 @@ static inline u32 fb_mmu_debug_rd_aperture_vid_mem_f(void) | |||
402 | { | 414 | { |
403 | return 0x0; | 415 | return 0x0; |
404 | } | 416 | } |
417 | static inline u32 fb_mmu_debug_rd_aperture_sys_mem_coh_f(void) | ||
418 | { | ||
419 | return 0x2; | ||
420 | } | ||
421 | static inline u32 fb_mmu_debug_rd_aperture_sys_mem_ncoh_f(void) | ||
422 | { | ||
423 | return 0x3; | ||
424 | } | ||
405 | static inline u32 fb_mmu_debug_rd_vol_false_f(void) | 425 | static inline u32 fb_mmu_debug_rd_vol_false_f(void) |
406 | { | 426 | { |
407 | return 0x0; | 427 | return 0x0; |
diff --git a/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h b/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h index a4989aba..500d2434 100644 --- a/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h | |||
@@ -82,6 +82,14 @@ static inline u32 fifo_runlist_base_target_vid_mem_f(void) | |||
82 | { | 82 | { |
83 | return 0x0; | 83 | return 0x0; |
84 | } | 84 | } |
85 | static inline u32 fifo_runlist_base_target_sys_mem_coh_f(void) | ||
86 | { | ||
87 | return 0x20000000; | ||
88 | } | ||
89 | static inline u32 fifo_runlist_base_target_sys_mem_ncoh_f(void) | ||
90 | { | ||
91 | return 0x30000000; | ||
92 | } | ||
85 | static inline u32 fifo_runlist_r(void) | 93 | static inline u32 fifo_runlist_r(void) |
86 | { | 94 | { |
87 | return 0x00002274; | 95 | return 0x00002274; |
diff --git a/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h index 37556fb9..39b7074f 100644 --- a/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h | |||
@@ -1010,6 +1010,14 @@ static inline u32 gr_fecs_current_ctx_target_vid_mem_f(void) | |||
1010 | { | 1010 | { |
1011 | return 0x0; | 1011 | return 0x0; |
1012 | } | 1012 | } |
1013 | static inline u32 gr_fecs_current_ctx_target_sys_mem_coh_f(void) | ||
1014 | { | ||
1015 | return 0x20000000; | ||
1016 | } | ||
1017 | static inline u32 gr_fecs_current_ctx_target_sys_mem_ncoh_f(void) | ||
1018 | { | ||
1019 | return 0x30000000; | ||
1020 | } | ||
1013 | static inline u32 gr_fecs_current_ctx_valid_s(void) | 1021 | static inline u32 gr_fecs_current_ctx_valid_s(void) |
1014 | { | 1022 | { |
1015 | return 1; | 1023 | return 1; |
diff --git a/drivers/gpu/nvgpu/gv11b/hw_pbdma_gv11b.h b/drivers/gpu/nvgpu/gv11b/hw_pbdma_gv11b.h index a921d502..3863c6d6 100644 --- a/drivers/gpu/nvgpu/gv11b/hw_pbdma_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/hw_pbdma_gv11b.h | |||
@@ -322,6 +322,14 @@ static inline u32 pbdma_userd_target_vid_mem_f(void) | |||
322 | { | 322 | { |
323 | return 0x0; | 323 | return 0x0; |
324 | } | 324 | } |
325 | static inline u32 pbdma_userd_target_sys_mem_coh_f(void) | ||
326 | { | ||
327 | return 0x2; | ||
328 | } | ||
329 | static inline u32 pbdma_userd_target_sys_mem_ncoh_f(void) | ||
330 | { | ||
331 | return 0x3; | ||
332 | } | ||
325 | static inline u32 pbdma_userd_addr_f(u32 v) | 333 | static inline u32 pbdma_userd_addr_f(u32 v) |
326 | { | 334 | { |
327 | return (v & 0x7fffff) << 9; | 335 | return (v & 0x7fffff) << 9; |
diff --git a/drivers/gpu/nvgpu/gv11b/hw_ram_gv11b.h b/drivers/gpu/nvgpu/gv11b/hw_ram_gv11b.h index d60f3bd2..a19e5251 100644 --- a/drivers/gpu/nvgpu/gv11b/hw_ram_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/hw_ram_gv11b.h | |||
@@ -70,6 +70,14 @@ static inline u32 ram_in_page_dir_base_target_vid_mem_f(void) | |||
70 | { | 70 | { |
71 | return 0x0; | 71 | return 0x0; |
72 | } | 72 | } |
73 | static inline u32 ram_in_page_dir_base_target_sys_mem_coh_f(void) | ||
74 | { | ||
75 | return 0x2; | ||
76 | } | ||
77 | static inline u32 ram_in_page_dir_base_target_sys_mem_ncoh_f(void) | ||
78 | { | ||
79 | return 0x3; | ||
80 | } | ||
73 | static inline u32 ram_in_page_dir_base_vol_w(void) | 81 | static inline u32 ram_in_page_dir_base_vol_w(void) |
74 | { | 82 | { |
75 | return 128; | 83 | return 128; |