From 0f2498ca09ed5642207e42560c9e89faebf2f455 Mon Sep 17 00:00:00 2001 From: Ken Adams Date: Mon, 21 Apr 2014 18:21:09 -0700 Subject: gpu: nvgpu: gk20a, gm20b headers update headers from latest gen_register/ip_check info Change-Id: Iae892ab7138e7bba4abc821b9d7893e768647daa Signed-off-by: Ken Adams Reviewed-on: http://git-master/r/399382 --- drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h index fad8d3a6..6fba0b46 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h @@ -98,6 +98,18 @@ static inline u32 gr_intr_illegal_notify_reset_f(void) { return 0x40; } +static inline u32 gr_intr_firmware_method_f(u32 v) +{ + return (v & 0x1) << 8; +} +static inline u32 gr_intr_firmware_method_pending_f(void) +{ + return 0x100; +} +static inline u32 gr_intr_firmware_method_reset_f(void) +{ + return 0x100; +} static inline u32 gr_intr_illegal_class_pending_f(void) { return 0x20; @@ -130,14 +142,6 @@ static inline u32 gr_intr_exception_reset_f(void) { return 0x200000; } -static inline u32 gr_intr_firmware_method_pending_f(void) -{ - return 0x100; -} -static inline u32 gr_intr_firmware_method_reset_f(void) -{ - return 0x100; -} static inline u32 gr_fecs_intr_r(void) { return 0x00400144; @@ -258,7 +262,7 @@ static inline u32 gr_status_fe_method_lower_idle_v(void) { return 0x00000000; } -static inline u32 gr_status_fe_method_fe_gi_v(u32 r) +static inline u32 gr_status_fe_gi_v(u32 r) { return (r >> 21) & 0x1; } -- cgit v1.2.2