gpu: nvgpu: gk20a, gm20b headers

update headers from latest gen_register/ip_check info

Change-Id: Iae892ab7138e7bba4abc821b9d7893e768647daa
Signed-off-by: Ken Adams <kadams@nvidia.com>
Reviewed-on: http://git-master/r/399382

1 files changed, 16 insertions, 24 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h
index 5ebb8365..83e7d776 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h
@@ -130,6 +130,22 @@ static inline u32 fifo_eng_timeslice_enable_true_f(void)
 {
         return 0x10000000;
 }
+static inline u32 fifo_eng_timeout_r(void)
+{
+        return 0x00002a0c;
+}
+static inline u32 fifo_eng_timeout_period_max_f(void)
+{
+        return 0x7fffffff;
+}
+static inline u32 fifo_eng_timeout_detection_enabled_f(void)
+{
+        return 0x80000000;
+}
+static inline u32 fifo_eng_timeout_detection_disabled_f(void)
+{
+        return 0x0;
+}
 static inline u32 fifo_pb_timeslice_r(u32 i)
 {
         return 0x00002350 + i*4;
@@ -350,30 +366,6 @@ static inline u32 fifo_pb_timeout_detection_enabled_f(void)
 {
         return 0x80000000;
 }
-static inline u32 fifo_eng_timeout_r(void)
-{
-        return 0x00002a0c;
-}
-static inline u32 fifo_eng_timeout_period_m(void)
-{
-        return 0x7fffffff << 0;
-}
-static inline u32 fifo_eng_timeout_period_max_f(void)
-{
-        return 0x7fffffff;
-}
-static inline u32 fifo_eng_timeout_detection_m(void)
-{
-        return 0x1 << 31;
-}
-static inline u32 fifo_eng_timeout_detection_enabled_f(void)
-{
-        return 0x80000000;
-}
-static inline u32 fifo_eng_timeout_detection_disabled_f(void)
-{
-        return 0x0;
-}
 static inline u32 fifo_error_sched_disable_r(void)
 {
         return 0x0000262c;