diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-05-26 19:12:19 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:52:05 -0500 |
commit | 94a7c5ff2cbe8a583e9b8fc4777e5debe4c48810 (patch) | |
tree | 2fc8d0010817a91bdaaec50b88bdecf7dfc58f60 /drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h | |
parent | 2907e24e8bb31f41d13692aef76aa7c0ca227525 (diff) |
gpu: nvgpu: gp10b: Fix PDE/PTE address handling
We were dropping the part of address that span word bounary. The register
generator does not know how to real with multi-word fields, to edit things
in manually.
Bug 1646531
Change-Id: I3ef06d6dfcb0a499ed45456d165fe60c91492250
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/747468
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h index fc65f57d..844cb142 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h | |||
@@ -72,7 +72,7 @@ static inline u32 gmmu_new_pde_aperture_video_memory_f(void) | |||
72 | } | 72 | } |
73 | static inline u32 gmmu_new_pde_address_sys_f(u32 v) | 73 | static inline u32 gmmu_new_pde_address_sys_f(u32 v) |
74 | { | 74 | { |
75 | return (v & 0xffffff) << 8; | 75 | return (v & 0xfffffff) << 8; |
76 | } | 76 | } |
77 | static inline u32 gmmu_new_pde_address_sys_w(void) | 77 | static inline u32 gmmu_new_pde_address_sys_w(void) |
78 | { | 78 | { |
@@ -164,7 +164,7 @@ static inline u32 gmmu_new_dual_pde_vol_big_false_f(void) | |||
164 | } | 164 | } |
165 | static inline u32 gmmu_new_dual_pde_address_small_sys_f(u32 v) | 165 | static inline u32 gmmu_new_dual_pde_address_small_sys_f(u32 v) |
166 | { | 166 | { |
167 | return (v & 0xffffff) << 8; | 167 | return (v & 0xfffffff) << 8; |
168 | } | 168 | } |
169 | static inline u32 gmmu_new_dual_pde_address_small_sys_w(void) | 169 | static inline u32 gmmu_new_dual_pde_address_small_sys_w(void) |
170 | { | 170 | { |
@@ -200,7 +200,7 @@ static inline u32 gmmu_new_pte_valid_false_f(void) | |||
200 | } | 200 | } |
201 | static inline u32 gmmu_new_pte_address_sys_f(u32 v) | 201 | static inline u32 gmmu_new_pte_address_sys_f(u32 v) |
202 | { | 202 | { |
203 | return (v & 0xffffff) << 8; | 203 | return (v & 0xfffffff) << 8; |
204 | } | 204 | } |
205 | static inline u32 gmmu_new_pte_address_sys_w(void) | 205 | static inline u32 gmmu_new_pte_address_sys_w(void) |
206 | { | 206 | { |