AMD Oled Power Optimization clenaup #4977 #5048

Author: seerge

app/Display/AmdDisplay.cs

@@ -1,45 +1,64 @@
 using Microsoft.Win32;
 using Ryzen;
-using System.Diagnostics;
 
-namespace GHelper.Display
+public static class AmdDisplay
 {
-    public static class AmdDisplay
+    private const string DisplayPath0 =
+        @"SYSTEM\CurrentControlSet\Control\Class\{4d36e968-e325-11ce-bfc1-08002be10318}\0001\DAL2_DATA__2_0\DisplayPath_0";
+
+    private static string _cachedAdjustmentPath = null;
+    private static bool _isPathSearched = false;
+
+    private static string GetAdjustmentPath()
     {
-        private const string DisplayPath0 =
-            @"SYSTEM\CurrentControlSet\Control\Class\" +
-            @"{4d36e968-e325-11ce-bfc1-08002be10318}\" +
-            @"0001\DAL2_DATA__2_0\DisplayPath_0";
+        if (_isPathSearched) return _cachedAdjustmentPath;
 
-        public static bool IsOledPowerOptimizationOnBattery()
+        try
         {
-            if (!AppConfig.IsOLED()) return false; 
-            //if (SystemInformation.PowerStatus.PowerLineStatus != PowerLineStatus.Offline) return false;
-            if (!RyzenControl.IsAMD()) return false;
-
-            try
+            using RegistryKey dp0 = Registry.LocalMachine.OpenSubKey(DisplayPath0, writable: false);
+            if (dp0 != null)
             {
-                using RegistryKey dp0 = Registry.LocalMachine.OpenSubKey(DisplayPath0, writable: false);
-                if (dp0 == null) return false;
-
-                // Find the first EDID_* subkey — there's only one for the internal panel
                 string edidKey = Array.Find(dp0.GetSubKeyNames(),
                     name => name.StartsWith("EDID_", StringComparison.OrdinalIgnoreCase));
 
-                if (edidKey == null) return false;
+                if (edidKey != null)
+                {
+                    _cachedAdjustmentPath = $@"HKEY_LOCAL_MACHINE\{DisplayPath0}\{edidKey}\Adjustment";
+                }
+            }
+        }
+        catch
+        {
+            // Handle permissions or missing keys silently
+        }
+        finally
+        {
+            _isPathSearched = true;
+        }
+
+        return _cachedAdjustmentPath;
+    }
 
-                using RegistryKey adjustment = dp0.OpenSubKey($@"{edidKey}\Adjustment", writable: false);
+    public static bool IsOledPowerOptimization()
+    {
+        if (!AppConfig.IsOLED() || !RyzenControl.IsAMD()) return false;
 
-                if (adjustment?.GetValue("DAL_SCE_Settings") is not byte[] data || data.Length < 5)
-                    return false;
+        try
+        {
+            string path = GetAdjustmentPath();
+            if (path == null) return false;
 
-                // Byte[4]: 0x02 = battery OLED optimization ON, 0x00 = OFF
-                return (data[4] & 0x02) != 0;
-            } catch
+            object value = Registry.GetValue(path, "DAL_SCE_Settings", null);
+
+            if (value is byte[] data && data.Length >= 5)
             {
-                return false;
+                return (data[4] & 0x02) != 0;
             }
-
+        } catch
+        {
+            Logger.WriteLine("Can't check AMD OLED Optimization flag");
         }
+
+        return false;
     }
 }

app/Display/VisualControl.cs

@@ -274,7 +274,7 @@ public static void SetVisual(SplendidCommand mode = SplendidCommand.Default, int
         {
             Task.Run(async () =>
             {
-                if (AmdDisplay.IsOledPowerOptimizationOnBattery()) Program.settingsForm.VisualiseAmdOled(true);
+                if (AmdDisplay.IsOledPowerOptimization()) Program.settingsForm.VisualiseAmdOled(true);
             });
 
             if (mode == SplendidCommand.None) return;
@@ -372,7 +372,7 @@ private static int RunSplendid(SplendidCommand command, int? param1 = null, int?
             bool isVivo = AppConfig.IsVivoZenPro();
             bool isSplenddid = File.Exists(splendidExe);
 
-            if (AmdDisplay.IsOledPowerOptimizationOnBattery())
+            if (AmdDisplay.IsOledPowerOptimization())
             {
                 Logger.WriteLine("Skipping command due to AMD OLED Power Optimization flag");
                 Program.settingsForm.VisualiseAmdOled(true);

app/Settings.cs

@@ -622,7 +622,7 @@ private void SettingsForm_Focused(object? sender, EventArgs e)
             if (activateCheck)
             {
                 buttonEnergySaver.Visible = PowerNative.GetBatterySaverStatus();
-                buttonAmdOled.Visible = AmdDisplay.IsOledPowerOptimizationOnBattery();
+                buttonAmdOled.Visible = AmdDisplay.IsOledPowerOptimization();
                 activateCheck = false;
             }
         }