summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshendra Gadagottu <sgadagottu@nvidia.com>2014-07-25 14:49:04 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:10:37 -0400
commitcc30ac4395809580d3d7ad9b3b6ac4aea099f9ec (patch)
treebf16063ada96a8f3967deaf1f35d876e09331a0d
parent1954c2ae8736cdef8e423be05dab48d64ac131d8 (diff)
gpu: nvgpu: gm20b: update gpu headers
Keep gm20b headers upto date with script output Change-Id: I0916df7c43616b1d9231436a512290c2fa901d64 Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com> Reviewed-on: http://git-master/r/447725 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Bo Yan <byan@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h8
-rw-r--r--drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h
index bf0b1ffd..817e4fc4 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h
@@ -58,10 +58,6 @@ static inline u32 fb_mmu_ctrl_r(void)
58{ 58{
59 return 0x00100c80; 59 return 0x00100c80;
60} 60}
61static inline u32 fb_priv_mmu_phy_secure_r(void)
62{
63 return 0x00100ce4;
64}
65static inline u32 fb_mmu_ctrl_vm_pg_size_f(u32 v) 61static inline u32 fb_mmu_ctrl_vm_pg_size_f(u32 v)
66{ 62{
67 return (v & 0x1) << 0; 63 return (v & 0x1) << 0;
@@ -82,6 +78,10 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r)
82{ 78{
83 return (r >> 16) & 0xff; 79 return (r >> 16) & 0xff;
84} 80}
81static inline u32 fb_priv_mmu_phy_secure_r(void)
82{
83 return 0x00100ce4;
84}
85static inline u32 fb_mmu_invalidate_pdb_r(void) 85static inline u32 fb_mmu_invalidate_pdb_r(void)
86{ 86{
87 return 0x00100cb8; 87 return 0x00100cb8;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h
index 250bb565..9a1c0e71 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h
@@ -138,14 +138,14 @@ static inline u32 gmmu_pte_valid_w(void)
138{ 138{
139 return 0; 139 return 0;
140} 140}
141static inline u32 gmmu_pte_valid_false_f(void)
142{
143 return 0x0;
144}
145static inline u32 gmmu_pte_valid_true_f(void) 141static inline u32 gmmu_pte_valid_true_f(void)
146{ 142{
147 return 0x1; 143 return 0x1;
148} 144}
145static inline u32 gmmu_pte_valid_false_f(void)
146{
147 return 0x0;
148}
149static inline u32 gmmu_pte_address_sys_f(u32 v) 149static inline u32 gmmu_pte_address_sys_f(u32 v)
150{ 150{
151 return (v & 0xfffffff) << 4; 151 return (v & 0xfffffff) << 4;