diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-04-08 15:03:32 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:52:12 -0500 |
commit | ae893b37c014b13f68aa7547640bda3589363f4d (patch) | |
tree | 5ac4fdb02df2513f0efc2f370d85521422888d4e /drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h | |
parent | 342d45e060ba9c6a7815633c351ec8d95422dcbb (diff) |
gpu: nvgpu: gp10b: Use sysmem aperture for SoC memory
In Tegra GPU, SoC memory has to be accessed as vidmem. In discrete GPU, it
has to be accessed as sysmem.
Change-Id: Id26588df17b4921533804f72bc8c0ac3892ae154
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1122591
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h index 30e4307d..86870aea 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h | |||
@@ -70,6 +70,14 @@ static inline u32 gmmu_new_pde_aperture_video_memory_f(void) | |||
70 | { | 70 | { |
71 | return 0x2; | 71 | return 0x2; |
72 | } | 72 | } |
73 | static inline u32 gmmu_new_pde_aperture_sys_mem_coh_f(void) | ||
74 | { | ||
75 | return 0x4; | ||
76 | } | ||
77 | static inline u32 gmmu_new_pde_aperture_sys_mem_ncoh_f(void) | ||
78 | { | ||
79 | return 0x6; | ||
80 | } | ||
73 | static inline u32 gmmu_new_pde_address_sys_f(u32 v) | 81 | static inline u32 gmmu_new_pde_address_sys_f(u32 v) |
74 | { | 82 | { |
75 | return (v & 0xfffffff) << 8; | 83 | return (v & 0xfffffff) << 8; |
@@ -118,6 +126,14 @@ static inline u32 gmmu_new_dual_pde_aperture_big_video_memory_f(void) | |||
118 | { | 126 | { |
119 | return 0x2; | 127 | return 0x2; |
120 | } | 128 | } |
129 | static inline u32 gmmu_new_dual_pde_aperture_big_sys_mem_coh_f(void) | ||
130 | { | ||
131 | return 0x4; | ||
132 | } | ||
133 | static inline u32 gmmu_new_dual_pde_aperture_big_sys_mem_ncoh_f(void) | ||
134 | { | ||
135 | return 0x6; | ||
136 | } | ||
121 | static inline u32 gmmu_new_dual_pde_address_big_sys_f(u32 v) | 137 | static inline u32 gmmu_new_dual_pde_address_big_sys_f(u32 v) |
122 | { | 138 | { |
123 | return (v & 0xfffffff) << 4; | 139 | return (v & 0xfffffff) << 4; |
@@ -138,6 +154,14 @@ static inline u32 gmmu_new_dual_pde_aperture_small_video_memory_f(void) | |||
138 | { | 154 | { |
139 | return 0x2; | 155 | return 0x2; |
140 | } | 156 | } |
157 | static inline u32 gmmu_new_dual_pde_aperture_small_sys_mem_coh_f(void) | ||
158 | { | ||
159 | return 0x4; | ||
160 | } | ||
161 | static inline u32 gmmu_new_dual_pde_aperture_small_sys_mem_ncoh_f(void) | ||
162 | { | ||
163 | return 0x6; | ||
164 | } | ||
141 | static inline u32 gmmu_new_dual_pde_vol_small_w(void) | 165 | static inline u32 gmmu_new_dual_pde_vol_small_w(void) |
142 | { | 166 | { |
143 | return 2; | 167 | return 2; |
@@ -238,6 +262,14 @@ static inline u32 gmmu_new_pte_aperture_video_memory_f(void) | |||
238 | { | 262 | { |
239 | return 0x0; | 263 | return 0x0; |
240 | } | 264 | } |
265 | static inline u32 gmmu_new_pte_aperture_sys_mem_coh_f(void) | ||
266 | { | ||
267 | return 0x4; | ||
268 | } | ||
269 | static inline u32 gmmu_new_pte_aperture_sys_mem_ncoh_f(void) | ||
270 | { | ||
271 | return 0x6; | ||
272 | } | ||
241 | static inline u32 gmmu_new_pte_read_only_w(void) | 273 | static inline u32 gmmu_new_pte_read_only_w(void) |
242 | { | 274 | { |
243 | return 0; | 275 | return 0; |