Merge branch 'fluke/refactor-patterns' into 'main'

bugfix: don't deadlock on change compute/vfio/compute

Closes #88 and #86

See merge request asus-linux/asusctl!58

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+# [3.5.2] - 2021-05-15
+### Changed
+- Bugfix: prevent the hang on compute/integrated mode change
+
 # [3.5.1] - 2021-04-25
 ### Changed
 + Anime:

Cargo.lock

@@ -206,7 +206,7 @@ dependencies = [
 
 [[package]]
 name = "daemon"
-version = "3.5.1"
+version = "3.5.2"
 dependencies = [
  "env_logger",
  "intel-pstate",

Cargo.toml

@@ -13,4 +13,4 @@ opt-level = 1
 
 [profile.bench]
 debug = false
-opt-level = 3
+opt-level = 3

README.md

@@ -160,7 +160,7 @@ Requirements are rust >= 1.40 installed from rustup.io if the distro provided ve
 
 ## Installing
 
-Packaging and auto-builds are available [here](https://build.opensuse.org/package/show/home:luke_nukem:asus/asus-nb-ctrl)
+Packaging and auto-builds are available [here](https://build.opensuse.org/package/show/home:luke_nukem:asus/asusctl)
 
 Download repositories are available [here](https://download.opensuse.org/repositories/home:/luke_nukem:/asus/)
 
@@ -243,6 +243,16 @@ Please file a support request.
 omit_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-uvm "
 ```
 
-# License
+# License & Trademarks
 
 Mozilla Public License 2 (MPL-2.0)
+
+---
+
+ASUS and ROG Trademark is either a US registered trademark or trademark of ASUSTeK Computer Inc. in the United States and/or other countries.
+
+Reference to any ASUS products, services, processes, or other information and/or use of ASUS Trademarks does not constitute or imply endorsement, sponsorship, or recommendation thereof by ASUS.
+
+The use of ROG and ASUS trademarks within this website and associated tools and libraries is only to provide a recognisable identifier to users to enable them to associate that these tools will work with ASUS ROG laptops.
+
+---

daemon/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "daemon"
-version = "3.5.1"
+version = "3.5.2"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]

daemon/src/ctrl_gfx/controller.rs

@@ -1,3 +1,4 @@
+use ::zbus::Connection;
 use ctrl_gfx::error::GfxError;
 use ctrl_gfx::*;
 use ctrl_rog_bios::CtrlRogBios;
@@ -14,7 +15,6 @@ use std::{str::FromStr, sync::mpsc};
 use std::{sync::Arc, sync::Mutex};
 use sysfs_class::{PciDevice, SysClass};
 use system::{GraphicsDevice, PciBus};
-use ::zbus::{Connection};
 
 use crate::*;
 
@@ -607,11 +607,14 @@ impl CtrlGraphics {
             let bus = self.bus.clone();
             Self::do_vendor_tasks(vendor, vfio_enable, &devices, &bus)?;
             info!("GFX: Graphics mode changed to {}", <&str>::from(vendor));
-            if let Ok(config) = self.config.lock() {
+            if matches!(vendor, GfxVendors::Compute | GfxVendors::Vfio) {
-                if matches!(vendor, GfxVendors::Compute | GfxVendors::Vfio)
+                loop {
-                    && config.gfx_save_compute_vfio
+                    if let Ok(config) = self.config.try_lock() {
-                {
+                        if config.gfx_save_compute_vfio {
-                    Self::save_gfx_mode(vendor, self.config.clone());
+                            Self::save_gfx_mode(vendor, self.config.clone());
+                        }
+                        return Ok(action_required);
+                    }
                 }
             }
         }
@@ -625,7 +628,7 @@ impl CtrlGraphics {
         let devices = self.nvidia.clone();
         let bus = self.bus.clone();
 
-        let vfio_enable = if let Ok(config) = self.config.lock() {
+        let vfio_enable = if let Ok(config) = self.config.try_lock() {
             config.gfx_vfio_enable
         } else {
             false