1 files changed, 46 insertions, 50 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h
index e2a4f2f2..747566f0 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h
@@ -94,10 +94,6 @@ static inline u32 ctxsw_prog_main_image_pm_mode_m(void)
 {
         return 0x7 << 0;
 }
-static inline u32 ctxsw_prog_main_image_pm_mode_v(u32 r)
-{
-        return (r >> 0) & 0x7;
-}
 static inline u32 ctxsw_prog_main_image_pm_mode_no_ctxsw_f(void)
 {
         return 0x0;
@@ -106,18 +102,14 @@ static inline u32 ctxsw_prog_main_image_pm_smpc_mode_m(void)
 {
         return 0x7 << 3;
 }
-static inline u32 ctxsw_prog_main_image_pm_smpc_mode_v(u32 r)
+static inline u32 ctxsw_prog_main_image_pm_smpc_mode_ctxsw_f(void)
 {
-        return (r >> 3) & 0x7;
+        return 0x8;
 }
 static inline u32 ctxsw_prog_main_image_pm_smpc_mode_no_ctxsw_f(void)
 {
         return 0x0;
 }
-static inline u32 ctxsw_prog_main_image_pm_smpc_mode_ctxsw_f(void)
-{
-        return 0x8;
-}
 static inline u32 ctxsw_prog_main_image_pm_ptr_o(void)
 {
         return 0x0000002c;
@@ -138,46 +130,6 @@ static inline u32 ctxsw_prog_main_image_magic_value_v_value_v(void)
 {
         return 0x600dc0de;
 }
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_o(void)
-{
-        return 0x000000a0;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_allow_all_f(void)
-{
-        return 0x0;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_allow_none_f(void)
-{
-        return 0x1;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_use_map_f(void)
-{
-        return 0x2;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_addr_lo_o(void)
-{
-        return 0x000000a4;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_addr_hi_o(void)
-{
-        return 0x000000a8;
-}
-static inline u32 ctxsw_prog_main_image_misc_options_o(void)
-{
-        return 0x0000003c;
-}
-static inline u32 ctxsw_prog_main_image_misc_options_verif_features_m(void)
-{
-        return 0x1 << 3;
-}
-static inline u32 ctxsw_prog_main_image_misc_options_verif_features_disabled_f(void)
-{
-        return 0x0;
-}
-static inline u32 ctxsw_prog_main_image_misc_options_verif_features_enabled_f(void)
-{
-        return 0x8;
-}
 static inline u32 ctxsw_prog_local_priv_register_ctl_o(void)
 {
         return 0x0000000c;
@@ -242,4 +194,48 @@ static inline u32 ctxsw_prog_extended_num_smpc_quadrants_v(void)
 {
         return 0x00000004;
 }
+static inline u32 ctxsw_prog_main_image_priv_access_map_config_o(void)
+{
+        return 0x000000a0;
+}
+static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_s(void)
+{
+        return 2;
+}
+static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_f(u32 v)
+{
+        return (v & 0x3) << 0;
+}
+static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_m(void)
+{
+        return 0x3 << 0;
+}
+static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_v(u32 r)
+{
+        return (r >> 0) & 0x3;
+}
+static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_use_map_f(void)
+{
+        return 0x2;
+}
+static inline u32 ctxsw_prog_main_image_priv_access_map_addr_lo_o(void)
+{
+        return 0x000000a4;
+}
+static inline u32 ctxsw_prog_main_image_priv_access_map_addr_hi_o(void)
+{
+        return 0x000000a8;
+}
+static inline u32 ctxsw_prog_main_image_misc_options_o(void)
+{
+        return 0x0000003c;
+}
+static inline u32 ctxsw_prog_main_image_misc_options_verif_features_m(void)
+{
+        return 0x1 << 3;
+}
+static inline u32 ctxsw_prog_main_image_misc_options_verif_features_disabled_f(void)
+{
+        return 0x0;
+}
 #endif