Only set Steam Deck memory speed in dpm force perf manual mode

backend/src/settings/dev_mode/gpu.rs

@@ -104,12 +104,22 @@ impl TGpu for Gpu {
                 min: lim.min.unwrap_or(11_000_000) / ppt_divisor,
                 max: lim.max.unwrap_or(42_000_000) / ppt_divisor,
             }),
-            fast_ppt_default: self.limits.fast_ppt_default.or_else(|| self.limits.fast_ppt.and_then(|x| x.max)).unwrap_or(2_000_000) / ppt_divisor,
+            fast_ppt_default: self
+                .limits
+                .fast_ppt_default
+                .or_else(|| self.limits.fast_ppt.and_then(|x| x.max))
+                .unwrap_or(2_000_000)
+                / ppt_divisor,
             slow_ppt_limits: self.limits.slow_ppt.map(|lim| crate::api::RangeLimit {
                 min: lim.min.unwrap_or(7_000_000) / ppt_divisor,
                 max: lim.max.unwrap_or(69_000_000) / ppt_divisor,
             }),
-            slow_ppt_default: self.limits.slow_ppt_default.or_else(|| self.limits.slow_ppt.and_then(|x| x.max)).unwrap_or(3_000_000) / ppt_divisor,
+            slow_ppt_default: self
+                .limits
+                .slow_ppt_default
+                .or_else(|| self.limits.slow_ppt.and_then(|x| x.max))
+                .unwrap_or(3_000_000)
+                / ppt_divisor,
             ppt_step: self.limits.ppt_step.unwrap_or(1),
             tdp_limits: self.limits.tdp.map(|lim| crate::api::RangeLimit {
                 min: lim.min.unwrap_or(11_000_000) / tdp_divisor,
@@ -135,7 +145,10 @@ impl TGpu for Gpu {
             }),
             memory_step: self.limits.memory_clock_step.unwrap_or(400),
         };
-        log::debug!("dev_mode_Gpu::limits(self) -> {}", serde_json::to_string_pretty(&limit_struct).unwrap());
+        log::debug!(
+            "dev_mode_Gpu::limits(self) -> {}",
+            serde_json::to_string_pretty(&limit_struct).unwrap()
+        );
         limit_struct
     }
 

backend/src/settings/generic/gpu.rs

@@ -168,7 +168,11 @@ impl TGpu for Gpu {
                     }
                 }),
             fast_ppt_default: {
-                let def = self.limits.fast_ppt_default.or_else(|| self.limits.fast_ppt.and_then(|x| x.max)).unwrap_or(15);
+                let def = self
+                    .limits
+                    .fast_ppt_default
+                    .or_else(|| self.limits.fast_ppt.and_then(|x| x.max))
+                    .unwrap_or(15);
                 if let Some(ppt_divisor) = self.limits.ppt_divisor {
                     def / ppt_divisor
                 } else {
@@ -190,7 +194,11 @@ impl TGpu for Gpu {
                     }
                 }),
             slow_ppt_default: {
-                let def = self.limits.slow_ppt_default.or_else(|| self.limits.slow_ppt.and_then(|x| x.max)).unwrap_or(15);
+                let def = self
+                    .limits
+                    .slow_ppt_default
+                    .or_else(|| self.limits.slow_ppt.and_then(|x| x.max))
+                    .unwrap_or(15);
                 if let Some(ppt_divisor) = self.limits.ppt_divisor {
                     def / ppt_divisor
                 } else {

backend/src/settings/steam_deck/gpu.rs

@@ -340,6 +340,7 @@ impl Gpu {
     }
 
     fn set_memory_speed(&self, clock: u64) -> Result<(), SettingError> {
+        if POWER_DPM_FORCE_PERFORMANCE_LEVEL_MGMT.needs_manual() {
             let path = GPU_MEMORY_DOWNCLOCK_ATTRIBUTE.path(&self.sysfs_card);
             let payload = self.build_memory_clock_payload(clock);
             log::debug!(
@@ -353,6 +354,9 @@ impl Gpu {
                     msg: format!("Failed to write to `{}`: {}", path.display(), e),
                     setting: crate::settings::SettingVariant::Gpu,
                 })
+        } else {
+            Ok(())
+        }
     }
 
     fn set_force_performance_related(&mut self) -> Result<(), Vec<SettingError>> {
@@ -362,7 +366,7 @@ impl Gpu {
         POWER_DPM_FORCE_PERFORMANCE_LEVEL_MGMT
             .enforce_level(&self.sysfs_card)
             .unwrap_or_else(|mut e| errors.append(&mut e));
-        // enable/disable downclock of GPU memory (to 400Mhz?)
+        // enable/disable downclock of GPU memory
         self.set_memory_speed(
             self.memory_clock
                 .or_else(|| {
@@ -631,6 +635,7 @@ impl crate::settings::OnLoad for Gpu {
 
 impl crate::settings::OnUnload for Gpu {
     fn on_unload(&mut self) -> Result<(), Vec<SettingError>> {
+        POWER_DPM_FORCE_PERFORMANCE_LEVEL_MGMT.set_gpu(false);
         Ok(())
     }
 }
@@ -646,14 +651,24 @@ impl TGpu for Gpu {
                 max: super::util::range_max_or_fallback(&self.limits.fast_ppt, MAX_FAST_PPT)
                     / ppt_divisor,
             }),
-            fast_ppt_default: self.limits.fast_ppt_default.or_else(|| self.limits.fast_ppt.and_then(|x| x.max)).unwrap_or(MAX_FAST_PPT) / ppt_divisor,
+            fast_ppt_default: self
+                .limits
+                .fast_ppt_default
+                .or_else(|| self.limits.fast_ppt.and_then(|x| x.max))
+                .unwrap_or(MAX_FAST_PPT)
+                / ppt_divisor,
             slow_ppt_limits: Some(RangeLimit {
                 min: super::util::range_min_or_fallback(&self.limits.slow_ppt, MIN_SLOW_PPT)
                     / ppt_divisor,
                 max: super::util::range_max_or_fallback(&self.limits.slow_ppt, MIN_SLOW_PPT)
                     / ppt_divisor,
             }),
-            slow_ppt_default: self.limits.slow_ppt_default.or_else(|| self.limits.slow_ppt.and_then(|x| x.max)).unwrap_or(MAX_SLOW_PPT) / ppt_divisor,
+            slow_ppt_default: self
+                .limits
+                .slow_ppt_default
+                .or_else(|| self.limits.slow_ppt.and_then(|x| x.max))
+                .unwrap_or(MAX_SLOW_PPT)
+                / ppt_divisor,
             ppt_step: self.limits.ppt_step.unwrap_or(1),
             tdp_limits: None,
             tdp_boost_limits: None,