system: Redo ProMotion check logic to use ioreg

This should also work in recoveryOS. Also handle clamshell mode
properly.

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

src/main.py

@@ -848,6 +848,12 @@ def main(self):
             split_ver(self.sysinfo.sfr_ver) >= split_ver(BUGGY_SFR_MIN)):
 
             hz = self.sysinfo.get_refresh_rate()
+            if hz is None:
+                p_error("Could not check ProMotion display status")
+                print("This probably means your laptop lid is closed. Please open it and try again.")
+                print("(You're going to have to use the power button soon anyway!)")
+                print()
+                sys.exit(1)
 
             if split_ver(self.sysinfo.sros_ver) < split_ver(BUGGY_SFR_MIN):
                 p_error("Mismatched System Firmware / System Recovery detected!")
@@ -862,10 +868,10 @@ def main(self):
                 p_plain( f"    {col(BLUE, BRIGHT)}https://github.com/AsahiLinux/docs/wiki/macOS-Sonoma-Boot-Failures{col()}")
                 print()
 
-                p_info(f"  Current refresh rate: {col()}{hz}")
+                p_info(f"  Current refresh rate: {col()}{hz} Hz")
                 print()
 
-                if hz != "120.00Hz":
+                if hz != 120.0:
                     p_error(f"{col(BLINK)}CRITICAL ERROR: {col(NBLINK)}Your display refresh rate is set to")
                     p_error("something other than 120Hz / ProMotion mode.")
                     print()
@@ -896,9 +902,9 @@ def main(self):
                 p_warning( "buggy and will NOT correctly boot older versions of macOS, nor Asahi Linux,")
                 p_warning( "if the display is configured for a refresh rate other than ProMotion (120Hz).")
                 print()
-                p_info(f"  Current refresh rate: {col()}{hz}")
+                p_info(f"  Current refresh rate: {col()}{hz} Hz")
                 print()
-                if hz != "120.00Hz":
+                if hz != 120.0:
                     p_error("Your display is not set to ProMotion mode (120 Hz). Please change your")
                     p_error("display refresh rate to ProMotion mode in System Settings and try again.")
                     print()

src/system.py

@@ -13,6 +13,10 @@ def fetch(self):
 
         self.ioreg = plistlib.loads(result.stdout)
 
+        result = subprocess.run(["ioreg", "-alp", "IOService"],
+                                stdout=subprocess.PIPE, check=True)
+        self.ioservice = plistlib.loads(result.stdout)
+
         for dt in self.ioreg["IORegistryEntryChildren"]:
             if dt.get("IOObjectClass", None) == "IOPlatformExpertDevice":
                 break
@@ -172,18 +176,33 @@ def get_int(self, val):
         return struct.unpack("<I", val)[0]
 
     def get_refresh_rate(self):
-        j = subprocess.run(["system_profiler", "SPDisplaysDataType", "-json"],
-                           stdout=subprocess.PIPE, check=True).stdout
+        machine = self.ioservice["IORegistryEntryChildren"][0]
+        for i in machine["IORegistryEntryChildren"]:
+            if i["IORegistryEntryName"] == "AppleARMPE":
+                armpe = i
+                break
+        else:
+            return None
+        for i in armpe["IORegistryEntryChildren"]:
+            if i["IORegistryEntryName"] == "arm-io":
+                armio = i
+                break
+        else:
+            return None
+        for i in armio["IORegistryEntryChildren"][0]["IORegistryEntryChildren"]:
+            if i["IORegistryEntryName"] == "disp0":
+                disp0 = i
+                break
+        else:
+            return None
 
-        main_display = None
-        for a in json.loads(j)["SPDisplaysDataType"]:
-            for disp in a.get("spdisplays_ndrvs", []):
-                if disp["_name"] != "Color LCD":
-                    continue
-                assert main_display is None
-                main_display = disp
+        props = disp0["IORegistryEntryChildren"][0]
+
+        if "TimingElements" not in props:
+            return None
 
-        if main_display is None:
-            return "(Unknown or off)"
+        te = {i["ID"]:i for i in props["TimingElements"]}
+        te_id = props["DPTimingModeId"]
+        refresh = te[te_id]["VerticalAttributes"]["SyncRate"] / 65536.0
 
-        return main_display["_spdisplays_resolution"].split()[-1]
+        return refresh