4 files changed, 14 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h
index aa8e6190..8b095b1a 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -140,6 +140,10 @@ static inline u32 ctxsw_prog_main_image_pm_mode_m(void)
 {
         return 0x7U << 0U;
 }
+static inline u32 ctxsw_prog_main_image_pm_mode_ctxsw_f(void)
+{
+        return 0x1U;
+}
 static inline u32 ctxsw_prog_main_image_pm_mode_no_ctxsw_f(void)
 {
         return 0x0U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h
index fe35bb71..767fc5a0 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h
@@ -62,7 +62,7 @@ static inline u32 fb_fbhub_num_active_ltcs_r(void)
 }
 static inline u32 fb_fbhub_num_active_ltcs_hub_sys_atomic_mode_m(void)
 {
-        return U32(0x1U) << 25U;
+        return 0x1U << 25U;
 }
 static inline u32 fb_fbhub_num_active_ltcs_hub_sys_atomic_mode_use_rmw_f(void)
 {
@@ -70,7 +70,7 @@ static inline u32 fb_fbhub_num_active_ltcs_hub_sys_atomic_mode_use_rmw_f(void)
 }
 static inline u32 fb_fbhub_num_active_ltcs_hub_sys_ncoh_atomic_mode_m(void)
 {
-        return U32(0x1U) << 26U;
+        return 0x1U << 26U;
 }
 static inline u32 fb_fbhub_num_active_ltcs_hub_sys_ncoh_atomic_mode_use_read_f(void)
 {
@@ -94,7 +94,7 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r)
 }
 static inline u32 fb_mmu_ctrl_atomic_capability_mode_m(void)
 {
-        return U32(0x3U) << 24U;
+        return 0x3U << 24U;
 }
 static inline u32 fb_mmu_ctrl_atomic_capability_mode_l2_f(void)
 {
@@ -106,7 +106,7 @@ static inline u32 fb_mmu_ctrl_atomic_capability_mode_rmw_f(void)
 }
 static inline u32 fb_mmu_ctrl_atomic_capability_sys_ncoh_mode_m(void)
 {
-        return U32(0x1U) << 27U;
+        return 0x1U << 27U;
 }
 static inline u32 fb_mmu_ctrl_atomic_capability_sys_ncoh_mode_l2_f(void)
 {
@@ -118,7 +118,7 @@ static inline u32 fb_hshub_num_active_ltcs_r(void)
 }
 static inline u32 fb_hshub_num_active_ltcs_hub_sys_atomic_mode_m(void)
 {
-        return U32(0x1U) << 25U;
+        return 0x1U << 25U;
 }
 static inline u32 fb_hshub_num_active_ltcs_hub_sys_atomic_mode_use_read_f(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
index 01dc99d5..f7d8089d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
@@ -4978,11 +4978,11 @@ static inline u32 gr_gpcs_pri_mmu_ctrl_mmu_disable_m(void)
 }
 static inline u32 gr_gpcs_pri_mmu_ctrl_atomic_capability_mode_m(void)
 {
-        return U32(0x3U) << 24U;
+        return 0x3U << 24U;
 }
 static inline u32 gr_gpcs_pri_mmu_ctrl_atomic_capability_sys_ncoh_mode_m(void)
 {
-        return U32(0x1U) << 27U;
+        return 0x1U << 27U;
 }
 static inline u32 gr_gpcs_pri_mmu_pm_unit_mask_r(void)
 {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pwr_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pwr_gv11b.h
index 295c6e95..03affe8e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pwr_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pwr_gv11b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -914,7 +914,7 @@ static inline u32 pwr_pmu_idle_intr_status_intr_f(u32 v)
 }
 static inline u32 pwr_pmu_idle_intr_status_intr_m(void)
 {
-        return U32(0x1U) << 0U;
+        return 0x1U << 0U;
 }
 static inline u32 pwr_pmu_idle_intr_status_intr_v(u32 r)
 {