From cc30ac4395809580d3d7ad9b3b6ac4aea099f9ec Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Fri, 25 Jul 2014 11:49:04 -0700 Subject: gpu: nvgpu: gm20b: update gpu headers Keep gm20b headers upto date with script output Change-Id: I0916df7c43616b1d9231436a512290c2fa901d64 Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/447725 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Bo Yan --- drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h | 8 ++++---- drivers/gpu/nvgpu/gm20b/hw_gmmu_gm20b.h | 8 ++++---- 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) { return 0x00100c80; } -static inline u32 fb_priv_mmu_phy_secure_r(void) -{ - return 0x00100ce4; -} static inline u32 fb_mmu_ctrl_vm_pg_size_f(u32 v) { return (v & 0x1) << 0; @@ -82,6 +78,10 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r) { return (r >> 16) & 0xff; } +static inline u32 fb_priv_mmu_phy_secure_r(void) +{ + return 0x00100ce4; +} static inline u32 fb_mmu_invalidate_pdb_r(void) { 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) { return 0; } -static inline u32 gmmu_pte_valid_false_f(void) -{ - return 0x0; -} static inline u32 gmmu_pte_valid_true_f(void) { return 0x1; } +static inline u32 gmmu_pte_valid_false_f(void) +{ + return 0x0; +} static inline u32 gmmu_pte_address_sys_f(u32 v) { return (v & 0xfffffff) << 4; -- cgit v1.2.2