From 6056528af809a9a861149e218bcaff250f964eea Mon Sep 17 00:00:00 2001 From: Adeel Raza Date: Mon, 22 Dec 2014 16:16:29 -0800 Subject: gpu: nvgpu: headers for linsim CL 34000094 Change-Id: I43380fda328414e96601e1c03c3e0ec28c0b4871 Signed-off-by: Adeel Raza Reviewed-on: http://git-master/r/666905 Tested-by: Terje Bergstrom Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp10b/hw_fifo_gp10b.h | 12 ++++++------ drivers/gpu/nvgpu/gp10b/hw_fuse_gp10b.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gp10b/hw_fifo_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_fifo_gp10b.h index d2629b08..d10345c3 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_fifo_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_fifo_gp10b.h @@ -276,23 +276,23 @@ static inline u32 fifo_intr_mmu_fault_info_r(u32 i) } static inline u32 fifo_intr_mmu_fault_info_type_v(u32 r) { - return (r >> 0) & 0xf; + return (r >> 0) & 0x1f; } -static inline u32 fifo_intr_mmu_fault_info_engine_subid_v(u32 r) +static inline u32 fifo_intr_mmu_fault_info_client_type_v(u32 r) { - return (r >> 6) & 0x1; + return (r >> 20) & 0x1; } -static inline u32 fifo_intr_mmu_fault_info_engine_subid_gpc_v(void) +static inline u32 fifo_intr_mmu_fault_info_client_type_gpc_v(void) { return 0x00000000; } -static inline u32 fifo_intr_mmu_fault_info_engine_subid_hub_v(void) +static inline u32 fifo_intr_mmu_fault_info_client_type_hub_v(void) { return 0x00000001; } static inline u32 fifo_intr_mmu_fault_info_client_v(u32 r) { - return (r >> 8) & 0x3f; + return (r >> 8) & 0x7f; } static inline u32 fifo_intr_pbdma_id_r(void) { diff --git a/drivers/gpu/nvgpu/gp10b/hw_fuse_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_fuse_gp10b.h index 272f7fb3..cdb28d08 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_fuse_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_fuse_gp10b.h @@ -64,15 +64,15 @@ static inline u32 fuse_ctrl_opt_ram_svop_pdp_r(void) } static inline u32 fuse_ctrl_opt_ram_svop_pdp_data_f(u32 v) { - return (v & 0x3) << 0; + return (v & 0xff) << 0; } static inline u32 fuse_ctrl_opt_ram_svop_pdp_data_m(void) { - return 0x3 << 0; + return 0xff << 0; } static inline u32 fuse_ctrl_opt_ram_svop_pdp_data_v(u32 r) { - return (r >> 0) & 0x3; + return (r >> 0) & 0xff; } static inline u32 fuse_ctrl_opt_ram_svop_pdp_override_r(void) { -- cgit v1.2.2