Merge pull request #11 from utajum/fix/firmware-attrs-gpu-modes

Add asus-armoury support, GPU mode fixes, add uninstall and appimage options to install scripts, Fix blocking reboot

Author: utajum

install/90-ghelper.conf

@@ -46,6 +46,22 @@ z /sys/bus/platform/devices/asus-nb-wmi/dgpu_disable 0666 - - -
 z /sys/bus/platform/devices/asus-nb-wmi/gpu_mux_mode 0666 - - -
 z /sys/bus/platform/devices/asus-nb-wmi/mini_led_mode 0666 - - -
 
+# ── ASUS firmware-attributes (asus-armoury ──
+# On newer kernels, legacy asus-nb-wmi sysfs attributes are replaced by
+# firmware-attributes under /sys/class/firmware-attributes/asus-armoury/.
+# The 'z' directive is safe — it does nothing if the path doesn't exist.
+z /sys/class/firmware-attributes/asus-armoury/attributes/throttle_thermal_policy/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/dgpu_disable/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/gpu_mux_mode/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/panel_od/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/panel_overdrive/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/mini_led_mode/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/ppt_pl1_spl/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/ppt_pl2_sppt/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/ppt_fppt/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/nv_dynamic_boost/current_value 0666 - - -
+z /sys/class/firmware-attributes/asus-armoury/attributes/nv_temp_target/current_value 0666 - - -
+
 # ── Keyboard backlight ──
 z /sys/class/leds/asus::kbd_backlight/brightness 0666 - - -
 z /sys/class/leds/asus::kbd_backlight/multi_intensity 0666 - - -

install/90-ghelper.rules

@@ -117,6 +117,12 @@ SUBSYSTEM=="backlight", ACTION=="add", \
 ACTION=="add|change", SUBSYSTEM=="module", KERNEL=="pcie_aspm", \
   RUN+="/bin/sh -c '[ -f /sys/module/pcie_aspm/parameters/policy ] && chmod 0666 /sys/module/pcie_aspm/parameters/policy'"
 
+# ── ASUS firmware-attributes (asus-armoury, kernel 6.8+) ──
+# On newer kernels, ASUS WMI attributes move to firmware-attributes.
+# chmod all current_value files under the asus-armoury attributes dir.
+ACTION=="add|change", SUBSYSTEM=="firmware-attributes", \
+  RUN+="/bin/sh -c 'for f in /sys/class/firmware-attributes/asus-armoury/attributes/*/current_value; do [ -f \"$f\" ] && chmod 0666 \"$f\"; done'"
+
 # ── CPU online/offline (core toggling) ──
 SUBSYSTEM=="cpu", ACTION=="add", \
   RUN+="/bin/sh -c 'for f in /sys/devices/system/cpu/cpu*/online; do [ -f \"$f\" ] && chmod 0666 \"$f\"; done'"

install/install-local.sh

@@ -1,3 +1,4 @@
+using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -26,7 +27,7 @@ public class App : Application
     // Business logic orchestrator
     public static ModeControl? Mode { get; private set; }
 
-    public static MainWindow? MainWindowInstance { get; private set; }
+    public static MainWindow? MainWindowInstance { get; set; }
     public static TrayIcon? TrayIconInstance { get; set; }
 
     // Legacy event codes for non-configurable keys
@@ -112,9 +113,23 @@ public override void OnFrameworkInitializationCompleted()
             // Update tray icon to match current mode
             UpdateTrayIcon();
 
+            // Start power state monitoring for auto GPU mode and auto performance
+            Power?.StartPowerMonitoring();
+            if (Power != null)
+            {
+                Power.PowerStateChanged += OnPowerStateChanged;
+            }
+
+            // Apply auto GPU mode on startup if enabled
+            AutoGpuMode();
+
             // Restore clamshell mode if it was enabled
             if (AppConfig.Is("toggle_clamshell_mode"))
                 UI.Views.ExtraWindow.StartClamshellInhibit();
+
+            // Register Unix signal handlers for clean shutdown on SIGTERM/SIGINT
+            // This prevents KDE/GNOME from hanging on logout/reboot
+            RegisterSignalHandlers(desktop);
         }
 
         base.OnFrameworkInitializationCompleted();
@@ -139,6 +154,9 @@ private void InitializePlatform()
         Logger.WriteLine($"Model: {System.GetModelName()}");
         Logger.WriteLine($"BIOS: {System.GetBiosVersion()}");
 
+        // Log which sysfs backend each attribute resolved to (legacy vs firmware-attributes)
+        SysfsHelper.LogResolvedAttributes();
+
         // Log detected features
         LogFeatureDetection();
     }
@@ -511,14 +529,35 @@ private NativeMenu CreateTrayMenu(IClassicDesktopStyleApplicationLifetime deskto
         menu.Add(new NativeMenuItemSeparator());
 
         // GPU modes
-        var eco = new NativeMenuItem("Eco (iGPU only)");
-        eco.Click += (_, _) => SetGpuMode(ecoEnabled: true);
+        var eco = new NativeMenuItem("GPU: Eco (iGPU only)");
+        eco.Click += (_, _) =>
+        {
+            AppConfig.Set("gpu_auto", 0);
+            SetGpuMode(ecoEnabled: true);
+            MainWindowInstance?.RefreshGpuModePublic();
+        };
         menu.Add(eco);
 
-        var standard = new NativeMenuItem("Standard (dGPU)");
-        standard.Click += (_, _) => SetGpuMode(ecoEnabled: false);
+        var standard = new NativeMenuItem("GPU: Standard (dGPU)");
+        standard.Click += (_, _) =>
+        {
+            AppConfig.Set("gpu_auto", 0);
+            SetGpuMode(ecoEnabled: false);
+            MainWindowInstance?.RefreshGpuModePublic();
+        };
         menu.Add(standard);
 
+        var optimized = new NativeMenuItem("GPU: Optimized (auto)");
+        optimized.Click += (_, _) =>
+        {
+            AppConfig.Set("gpu_auto", 1);
+            AutoGpuMode();
+            MainWindowInstance?.RefreshGpuModePublic();
+            System?.ShowNotification("GPU Mode",
+                "Optimized — auto Eco/Standard based on power", "video-display");
+        };
+        menu.Add(optimized);
+
         menu.Add(new NativeMenuItemSeparator());
 
         // Settings
@@ -541,7 +580,16 @@ private NativeMenu CreateTrayMenu(IClassicDesktopStyleApplicationLifetime deskto
 
     private void ToggleMainWindow()
     {
-        if (MainWindowInstance == null) return;
+        // Window may have been disposed by closing (KDE logout, user clicking X).
+        // Recreate it if needed — app stays alive via ShutdownMode.OnExplicitShutdown.
+        if (MainWindowInstance == null || MainWindowInstance.PlatformImpl == null)
+        {
+            MainWindowInstance = new MainWindow();
+            if (AppConfig.Is("topmost")) MainWindowInstance.Topmost = true;
+            MainWindowInstance.Show();
+            MainWindowInstance.Activate();
+            return;
+        }
 
         if (MainWindowInstance.IsVisible)
         {
@@ -562,11 +610,144 @@ private void SetGpuMode(bool ecoEnabled)
         System?.ShowNotification("GPU Mode", status, "video-display");
     }
 
+    /// <summary>
+    /// Handle power state change (AC plugged/unplugged).
+    /// Triggers auto GPU mode switch and auto performance mode.
+    /// </summary>
+    private void OnPowerStateChanged(bool onAc)
+    {
+        Logger.WriteLine($"Power state changed: AC={onAc}");
+
+        // Auto GPU mode (Optimized = auto Eco/Standard based on AC power)
+        AutoGpuMode();
+
+        // Auto performance mode (if configured)
+        Mode?.AutoPerformance(powerChanged: true);
+
+        // Refresh UI
+        Avalonia.Threading.Dispatcher.UIThread.Post(() =>
+        {
+            MainWindowInstance?.RefreshGpuModePublic();
+        });
+    }
+
+    /// <summary>
+    /// Auto-switch GPU between Eco and Standard based on AC power state.
+    /// This implements Windows G-Helper's "Optimized" GPU mode (gpu_auto flag).
+    /// Called on startup and on every power state change.
+    /// </summary>
+    public static void AutoGpuMode()
+    {
+        if (!AppConfig.Is("gpu_auto")) return;
+
+        var wmi = Wmi;
+        var power = Power;
+        if (wmi == null || power == null) return;
+
+        // Don't auto-switch if in Ultimate (MUX=0) — user must manually switch out
+        int mux = wmi.GetGpuMuxMode();
+        if (mux == 0)
+        {
+            Logger.WriteLine("AutoGpuMode: MUX=0 (Ultimate), skipping auto-switch");
+            return;
+        }
+
+        bool onAc = power.IsOnAcPower();
+        bool ecoEnabled = wmi.GetGpuEco();
+
+        if (onAc && ecoEnabled)
+        {
+            // Plugged in → switch to Standard (enable dGPU)
+            Logger.WriteLine("AutoGpuMode: AC power detected, switching Eco → Standard");
+            Task.Run(() =>
+            {
+                try
+                {
+                    wmi.SetGpuEco(false);
+                    System?.ShowNotification("GPU Mode",
+                        "Optimized: AC power — dGPU enabled", "video-display");
+                }
+                catch (Exception ex)
+                {
+                    Logger.WriteLine($"AutoGpuMode Eco→Standard failed: {ex.Message}");
+                }
+            });
+        }
+        else if (!onAc && !ecoEnabled)
+        {
+            // On battery → switch to Eco (disable dGPU for battery life)
+            Logger.WriteLine("AutoGpuMode: Battery detected, switching Standard → Eco");
+            Task.Run(() =>
+            {
+                try
+                {
+                    wmi.SetGpuEco(true);
+                    System?.ShowNotification("GPU Mode",
+                        "Optimized: Battery — dGPU disabled", "video-display");
+                }
+                catch (Exception ex)
+                {
+                    Logger.WriteLine($"AutoGpuMode Standard→Eco failed: {ex.Message}");
+                }
+            });
+        }
+    }
+
+    // Unix signal handlers for clean shutdown on SIGTERM/SIGINT (logout/reboot)
+    private static List<PosixSignalRegistration>? _signalRegistrations;
+
+    private void RegisterSignalHandlers(IClassicDesktopStyleApplicationLifetime desktop)
+    {
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            return;
+
+        try
+        {
+            _signalRegistrations = new();
+
+            // SIGTERM: sent by KDE/GNOME during logout/reboot
+            _signalRegistrations.Add(PosixSignalRegistration.Create(PosixSignal.SIGTERM, _ =>
+            {
+                Logger.WriteLine("Received SIGTERM - initiating shutdown");
+                ShutdownFromSignal(desktop);
+            }));
+
+            // SIGINT: Ctrl+C in terminal
+            _signalRegistrations.Add(PosixSignalRegistration.Create(PosixSignal.SIGINT, _ =>
+            {
+                Logger.WriteLine("Received SIGINT - initiating shutdown");
+                ShutdownFromSignal(desktop);
+            }));
+
+            Logger.WriteLine("Unix signal handlers registered (SIGTERM, SIGINT)");
+        }
+        catch (Exception ex)
+        {
+            Logger.WriteLine($"Failed to register signal handlers: {ex.Message}");
+        }
+    }
+
+    private void ShutdownFromSignal(IClassicDesktopStyleApplicationLifetime desktop)
+    {
+        // Signal handler runs on a threadpool thread.
+        // Don't rely on UI thread — it may already be blocked during session shutdown.
+        Logger.WriteLine("Signal shutdown: cleaning up...");
+
+        try { Power?.StopPowerMonitoring(); } catch { }
+        try { UI.Views.ExtraWindow.StopClamshellInhibit(); } catch { }
+        try { Input?.Dispose(); } catch { }
+        try { Wmi?.Dispose(); } catch { }
+
+        Logger.WriteLine("Signal shutdown: exiting process");
+        Environment.Exit(0);
+    }
+
     private void Shutdown(IClassicDesktopStyleApplicationLifetime desktop)
     {
         Logger.WriteLine("Shutting down...");
 
         // Cleanup
+        Power?.StopPowerMonitoring();
         UI.Views.ExtraWindow.StopClamshellInhibit();
         Input?.Dispose();
         Wmi?.Dispose();

install/install.sh

@@ -145,8 +145,8 @@ private static void AppendSysfsState(StringBuilder sb)
     {
         sb.AppendLine("--- Sysfs State ---");
 
-        // Fixed paths we use
-        var paths = new[]
+        // Fixed paths (non-WMI attributes — always at known locations)
+        var fixedPaths = new[]
         {
             // Battery
             "/sys/class/power_supply/BAT0/charge_control_end_threshold",
@@ -156,40 +156,25 @@ private static void AppendSysfsState(StringBuilder sb)
             // Keyboard
             "/sys/class/leds/asus::kbd_backlight/brightness",
             "/sys/class/leds/asus::kbd_backlight/multi_intensity",
-            // Performance
-            "/sys/devices/platform/asus-nb-wmi/throttle_thermal_policy",
-            "/sys/devices/platform/asus-nb-wmi/ppt_pl1_spl",
-            "/sys/devices/platform/asus-nb-wmi/ppt_pl2_sppt",
-            "/sys/devices/platform/asus-nb-wmi/ppt_fppt",
-            "/sys/devices/platform/asus-nb-wmi/nv_dynamic_boost",
-            "/sys/devices/platform/asus-nb-wmi/nv_temp_target",
-            "/sys/devices/platform/asus-nb-wmi/panel_od",
             // Platform profile
             "/sys/firmware/acpi/platform_profile",
             "/sys/firmware/acpi/platform_profile_choices",
-            // GPU
-            "/sys/bus/platform/devices/asus-nb-wmi/dgpu_disable",
-            "/sys/bus/platform/devices/asus-nb-wmi/gpu_mux_mode",
-            "/sys/bus/platform/devices/asus-nb-wmi/mini_led_mode",
             // CPU boost
             "/sys/devices/system/cpu/intel_pstate/no_turbo",
             "/sys/devices/system/cpu/cpufreq/boost",
             // ASPM
             "/sys/module/pcie_aspm/parameters/policy",
         };
 
-        foreach (var path in paths)
+        foreach (var path in fixedPaths)
         {
             if (!File.Exists(path))
-                continue; // skip missing — don't clutter output
+                continue;
 
             var perms = GetFilePermissions(path);
             var value = Platform.Linux.SysfsHelper.ReadAttribute(path) ?? "(read failed)";
 
-            // Shorten path for readability
             var shortPath = path
-                .Replace("/sys/devices/platform/asus-nb-wmi/", "asus-nb-wmi/")
-                .Replace("/sys/bus/platform/devices/asus-nb-wmi/", "asus-nb-wmi/")
                 .Replace("/sys/class/power_supply/", "power_supply/")
                 .Replace("/sys/class/leds/", "leds/")
                 .Replace("/sys/devices/system/cpu/", "cpu/")
@@ -199,6 +184,34 @@ private static void AppendSysfsState(StringBuilder sb)
             sb.AppendLine($"  {shortPath}: {perms} = {value}");
         }
 
+        // Resolved WMI attributes (may be legacy sysfs or firmware-attributes)
+        sb.AppendLine();
+        sb.AppendLine("  WMI attributes (resolved via ResolveAttrPath):");
+
+        var wmiAttrs = new[]
+        {
+            "throttle_thermal_policy", "ppt_pl1_spl", "ppt_pl2_sppt", "ppt_fppt",
+            "nv_dynamic_boost", "nv_temp_target", "panel_od",
+            "dgpu_disable", "gpu_mux_mode", "mini_led_mode"
+        };
+
+        foreach (var attr in wmiAttrs)
+        {
+            var resolved = Platform.Linux.SysfsHelper.ResolveAttrPath(attr,
+                Platform.Linux.SysfsHelper.AsusWmiPlatform,
+                Platform.Linux.SysfsHelper.AsusBusPlatform);
+
+            if (resolved == null)
+                continue;
+
+            var perms = GetFilePermissions(resolved);
+            var value = Platform.Linux.SysfsHelper.ReadAttribute(resolved) ?? "(read failed)";
+            string backend = Platform.Linux.SysfsHelper.IsFirmwareAttributesPath(resolved)
+                ? "fw-attr" : "legacy";
+
+            sb.AppendLine($"    {attr} [{backend}]: {perms} = {value}");
+        }
+
         sb.AppendLine();
     }