Merge branch 'fluke/optimising' into 'main'

Fluke/optimising See merge request asus-linux/asus-nb-ctrl!34
Refactored gfx switch session monitor
2026-01-22 17:33:19 +01:00 · 2021-03-16 08:12:01 +00:00 · 2021-03-16 21:09:17 +13:00 · 2021-03-14 08:30:39 +00:00 · 2021-03-13 22:07:31 +13:00 · 2021-03-13 01:01:22 +05:30
24 changed files with 783 additions and 334 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

 ## [Unreleased]
+# [3.1.7] - 2021-03-11
+### Changed
+- Refactor many parts of daemon
+- Switch out session monitoring to logind-zbus 
+
+# [3.1.6] - 2021-03-11
+### Changed
+- Graphics switching will now wait until all users logged out before switching 
+
+### Changed
+- Further tweaks to gfx switching
+- More logging on gfx switching
+- Filter bios help according to supported modes
+- Prevent gfx mode switching if in dedicated/G-Sync mode
+
 # [3.1.4] - 2021-03-10
 ### Changed
 - Notify through dbus if user changes profile manually
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,7 +33,7 @@ dependencies = [

 [[package]]
 name = "asusctl"
-version = "3.1.1"
+version = "3.1.3"
 dependencies = [
 "daemon",
 "gumdrop",
@@ -64,6 +64,15 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "async-lock"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb"
+dependencies = [
+ "event-listener",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -118,9 +127,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"

 [[package]]
 name = "byteorder"
-version = "1.4.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

 [[package]]
 name = "cache-padded"
@@ -176,23 +185,23 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae8f328835f8f5a6ceb6a7842a7f2d0c03692adb5c889347235d59194731fe3"
+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
 dependencies = [
 "autocfg",
 "cfg-if 1.0.0",
 "lazy_static",
- "loom",
 ]

 [[package]]
 name = "daemon"
-version = "3.1.4"
+version = "3.1.7"
 dependencies = [
 "env_logger",
 "intel-pstate",
 "log",
+ "logind-zbus",
 "rog_dbus",
 "rog_fan_curve",
 "rog_types",
@@ -203,7 +212,7 @@ dependencies = [
 "sysfs-class",
 "toml",
 "udev",
- "zbus",
+ "zbus 2.0.0-beta.3",
 "zvariant",
 ]

@@ -215,7 +224,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 ]

 [[package]]
@@ -247,7 +256,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 ]

 [[package]]
@@ -273,10 +282,16 @@ dependencies = [
 "proc-macro2",
 "quote 1.0.9",
 "rustversion",
- "syn 1.0.60",
+ "syn 1.0.64",
 "synstructure",
 ]

+[[package]]
+name = "event-listener"
+version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
+
 [[package]]
 name = "fastrand"
 version = "1.4.0"
@@ -288,9 +303,9 @@ dependencies = [

 [[package]]
 name = "futures"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
+checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -303,9 +318,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
+checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -313,15 +328,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
+checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"

 [[package]]
 name = "futures-executor"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
+checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -330,9 +345,9 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
+checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"

 [[package]]
 name = "futures-lite"
@@ -351,36 +366,33 @@ dependencies = [

 [[package]]
 name = "futures-macro"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
+checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
 dependencies = [
 "proc-macro-hack",
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 ]

 [[package]]
 name = "futures-sink"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
+checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"

 [[package]]
 name = "futures-task"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
-dependencies = [
- "once_cell",
-]
+checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"

 [[package]]
 name = "futures-util"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
+checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -396,19 +408,6 @@ dependencies = [
 "slab",
 ]

-[[package]]
-name = "generator"
-version = "0.6.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "winapi",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -420,6 +419,17 @@ dependencies = [
 "wasi 0.9.0+wasi-snapshot-preview1",
 ]

+[[package]]
+name = "getrandom"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "wasi 0.10.2+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "gumdrop"
 version = "0.8.0"
@@ -437,7 +447,7 @@ checksum = "915ef07c710d84733522461de2a734d4d62a3fd39a4d4f404c2f385ef8618d05"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 ]

 [[package]]
@@ -449,6 +459,12 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -488,9 +504,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.86"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
+checksum = "538c092e5586f4cdd7dd8078c4a79220e3e168880218124dcbce860f0ea938c6"

 [[package]]
 name = "libudev-sys"
@@ -524,14 +540,17 @@ dependencies = [
 ]

 [[package]]
-name = "loom"
-version = "0.4.0"
+name = "logind-zbus"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d44c73b4636e497b4917eb21c33539efa3816741a2d3ff26c6316f1b529481a4"
+checksum = "6671f6cf88b63e9d63009f4f6f8826fcc265c51a9977e4c7dc1263d743e0dfbb"
 dependencies = [
- "cfg-if 1.0.0",
- "generator",
- "scoped-tls",
+ "serde",
+ "serde_json",
+ "zbus 2.0.0-beta.3",
+ "zbus_macros 2.0.0-beta.3",
+ "zvariant",
+ "zvariant_derive",
 ]

 [[package]]
@@ -584,6 +603,18 @@ dependencies = [
 "void",
 ]

+[[package]]
+name = "nix"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
+dependencies = [
+ "bitflags 1.2.1",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
 [[package]]
 name = "nom"
 version = "5.1.2"
@@ -596,14 +627,14 @@ dependencies = [

 [[package]]
 name = "notify-rust"
-version = "4.2.2"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a3a5dd7b4b415b112ce0fae1988f3e6dee90a96918bf3950b5f2289b19a04b"
+checksum = "00c16afe17474a42a59062f3409a63160c63d41985b25e9e613400685b839cb6"
 dependencies = [
 "mac-notification-sys",
 "serde",
 "winrt-notification",
- "zbus",
+ "zbus 1.8.0",
 "zvariant",
 "zvariant_derive",
 ]
@@ -664,9 +695,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.5.2"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"

 [[package]]
 name = "parking"
@@ -676,9 +707,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"

 [[package]]
 name = "pin-project-lite"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"

 [[package]]
 name = "pin-utils"
@@ -705,6 +736,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "ppv-lite86"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
 [[package]]
 name = "proc-macro-crate"
 version = "0.1.5"
@@ -723,7 +760,7 @@ dependencies = [
 "proc-macro-error-attr",
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 "version_check",
 ]

@@ -774,6 +811,46 @@ dependencies = [
 "proc-macro2",
 ]

+[[package]]
+name = "rand"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
+dependencies = [
+ "getrandom 0.2.2",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
+dependencies = [
+ "rand_core",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.1.57"
@@ -786,28 +863,27 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
 dependencies = [
- "getrandom",
+ "getrandom 0.1.16",
 "redox_syscall",
 "rust-argon2",
 ]

 [[package]]
 name = "regex"
-version = "1.4.3"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
 dependencies = [
 "aho-corasick",
 "memchr",
 "regex-syntax",
- "thread_local",
 ]

 [[package]]
 name = "regex-syntax"
-version = "0.6.22"
+version = "0.6.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"

 [[package]]
 name = "rog_dbus"
@@ -816,16 +892,16 @@ dependencies = [
 "rog_fan_curve",
 "rog_types",
 "serde_json",
- "zbus",
- "zbus_macros",
+ "zbus 1.8.0",
+ "zbus_macros 1.8.0",
 "zvariant",
 ]

 [[package]]
 name = "rog_fan_curve"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71cfe91a717104796aeefea4e98ce5cefb11f2bb5dd10bba865dd4ae86273cb"
+checksum = "d083149d6e2681d05882e7ff557dec07211a6349f6de9446073b2c7dfd81e2f2"
 dependencies = [
 "serde",
 ]
@@ -884,29 +960,29 @@ checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"

 [[package]]
 name = "serde"
-version = "1.0.123"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
+checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.123"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
+checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.62"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
 dependencies = [
 "itoa",
 "ryu",
@@ -921,15 +997,30 @@ checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 ]

+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+
 [[package]]
 name = "slab"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"

+[[package]]
+name = "slotmap"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab3003725ae562cf995f3dc82bb99e70926e09000396816765bb6d7adbe740b1"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "smart-default"
 version = "0.6.0"
@@ -938,7 +1029,7 @@ checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 ]

 [[package]]
@@ -981,9 +1072,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.60"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
@@ -1007,7 +1098,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 "unicode-xid 0.2.1",
 ]

@@ -1029,23 +1120,13 @@ dependencies = [
 "winapi-util",
 ]

-[[package]]
-name = "thread_local"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
-dependencies = [
- "once_cell",
-]
-
 [[package]]
 name = "time"
-version = "0.1.44"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
 "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
 "winapi",
 ]

@@ -1104,9 +1185,9 @@ checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d"

 [[package]]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"

 [[package]]
 name = "void"
@@ -1128,9 +1209,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"

 [[package]]
 name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"

 [[package]]
 name = "wepoll-sys"
@@ -1225,13 +1306,41 @@ dependencies = [
 "fastrand",
 "futures",
 "nb-connect",
- "nix",
+ "nix 0.17.0",
 "once_cell",
 "polling",
 "scoped-tls",
 "serde",
 "serde_repr",
- "zbus_macros",
+ "zbus_macros 1.8.0",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus"
+version = "2.0.0-beta.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e1e656194618d167524f97e88ff9bf87f2b1e8bf58f357b2a7abfdff8cc85c9"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "byteorder",
+ "derivative",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.19.1",
+ "once_cell",
+ "rand",
+ "scoped-tls",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "slotmap",
+ "zbus_macros 2.0.0-beta.3",
 "zvariant",
 ]

@@ -1244,14 +1353,26 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "2.0.0-beta.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcd4cb372bc2cade3f2323e4104112dceb6819f5dd9afa98515b4e821d232932"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote 1.0.9",
+ "syn 1.0.64",
 ]

 [[package]]
 name = "zvariant"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc67d552ac18ccd9e440f062f5b32c46776f96073122a8da2fe0c533833a213"
+checksum = "678e7262502a135f49b1ece65010526649be7ee68acb80e1fc5377fc71fef878"
 dependencies = [
 "byteorder",
 "enumflags2",
@@ -1261,12 +1382,12 @@ dependencies = [

 [[package]]
 name = "zvariant_derive"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaee686340b5bff077d52423d8cc4f0f7cb323fe3f31ef676b8a3a2810bc53c5"
+checksum = "27d7c34325a35020b94343389cc9391e0f8ac245cca9155429c4022d93141241"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.60",
+ "syn 1.0.64",
 ]
--- a/2
+++ b/2
@@ -54,6 +54,7 @@ install:
 	$(INSTALL_DATA) "./data/icons/asus_notif_green.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_green.png"
 	$(INSTALL_DATA) "./data/icons/asus_notif_red.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_red.png"
 	$(INSTALL_DATA) "./data/_asusctl" "$(DESTDIR)$(zshcpl)/_asusctl"
+	$(INSTALL_DATA) "./data/completions/asusctl.fish" "$(DESTDIR)$(datarootdir)/fish/vendor_completions.d/asusctl.fish"

 uninstall:
 	rm -f "$(DESTDIR)$(bindir)/$(BIN_C)"
@@ -70,6 +71,7 @@ uninstall:
 	rm -r "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_green.png"
 	rm -r "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_red.png"
 	rm -f "$(DESTDIR)$(zshcpl)/_asusctl"
+	rm -f "$(DESTDIR)$(datarootdir)/fish/vendor_completions.d/asusctl.fish"

 update:
 	cargo update
--- a/asusctl/Cargo.toml
+++ b/asusctl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "asusctl"
-version = "3.1.1"
+version = "3.1.3"
 authors = ["Luke D Jones <luke@ljones.dev>"]
 edition = "2018"

--- a/asusctl/src/main.rs
+++ b/asusctl/src/main.rs
@@ -1,11 +1,12 @@
 use daemon::{
    ctrl_fan_cpu::FanCpuSupportedFunctions, ctrl_leds::LedSupportedFunctions,
-    ctrl_supported::SupportedFunctions,
+    ctrl_rog_bios::RogBiosSupportedFunctions, ctrl_supported::SupportedFunctions,
 };
 use gumdrop::{Opt, Options};
 use rog_dbus::AuraDbusClient;
 use rog_types::{
    anime_matrix::{AniMeDataBuffer, FULL_PANE_LEN},
+    aura_modes::AuraModes,
    cli_options::{AniMeActions, AniMeStatusValue, LedBrightness, SetAuraBuiltin},
    gfx_vendors::GfxVendors,
    profile::{FanLevel, ProfileCommand, ProfileEvent},
@@ -97,11 +98,15 @@ struct AniMeCommand {
 struct BiosCommand {
    #[options(help = "print help message")]
    help: bool,
-    #[options(meta = "", no_long, help = "toggle bios POST sound")]
+    #[options(meta = "", no_long, help = "set bios POST sound <true/false>")]
    post_sound_set: Option<bool>,
    #[options(no_long, help = "read bios POST sound")]
    post_sound_get: bool,
-    #[options(meta = "", no_long, help = "toggle GPU to/from dedicated mode")]
+    #[options(
+        meta = "",
+        no_long,
+        help = "activate dGPU dedicated/G-Sync <true/false>"
+    )]
    dedicated_gfx_set: Option<bool>,
    #[options(no_long, help = "get GPU mode")]
    dedicated_gfx_get: bool,
@@ -149,7 +154,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
    match parsed.command {
        Some(CliCommand::LedMode(mode)) => handle_led_mode(&dbus, &supported.keyboard_led, &mode)?,
        Some(CliCommand::Profile(cmd)) => handle_profile(&dbus, &supported.fan_cpu_ctrl, &cmd)?,
-        Some(CliCommand::Graphics(cmd)) => do_gfx(&dbus, cmd)?,
+        Some(CliCommand::Graphics(cmd)) => do_gfx(&dbus, &supported.rog_bios_ctrl, cmd)?,
        Some(CliCommand::AniMe(cmd)) => {
            if (cmd.command.is_none() && cmd.boot.is_none() && cmd.turn.is_none()) || cmd.help {
                println!("Missing arg or command\n\n{}", cmd.self_usage());
@@ -173,43 +178,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                }
            }
        }
-        Some(CliCommand::Bios(cmd)) => {
-            if (cmd.dedicated_gfx_set.is_none()
-                && !cmd.dedicated_gfx_get
-                && cmd.post_sound_set.is_none()
-                && !cmd.post_sound_get)
-                || cmd.help
-            {
-                println!("Missing arg or command\n\n{}", cmd.self_usage());
-                if let Some(lst) = cmd.self_command_list() {
-                    println!("\n{}", lst);
-                }
-            }
-
-            if let Some(opt) = cmd.post_sound_set {
-                dbus.proxies().rog_bios().set_post_sound(opt)?;
-            }
-            if cmd.post_sound_get {
-                let res = if dbus.proxies().rog_bios().get_post_sound()? == 1 {
-                    true
-                } else {
-                    false
-                };
-                println!("Bios POST sound on: {}", res);
-            }
-            if let Some(opt) = cmd.dedicated_gfx_set {
-                dbus.proxies().rog_bios().set_dedicated_gfx(opt)?;
-            }
-            if cmd.dedicated_gfx_get {
-                let res = if dbus.proxies().rog_bios().get_dedicated_gfx()? == 1 {
-                    true
-                } else {
-                    false
-                };
-                println!("Bios dedicated GPU on: {}", res);
-                println!("You must reboot your system to activate dedicated Nvidia mode");
-            }
-        }
+        Some(CliCommand::Bios(cmd)) => handle_bios_option(&dbus, &supported.rog_bios_ctrl, &cmd)?,
        None => {
            if (!parsed.show_supported
                && parsed.kbd_bright.is_none()
@@ -236,7 +205,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

    if parsed.show_supported {
        let dat = dbus.proxies().supported().get_supported_functions()?;
-        println!("Supported laptop functions:\n{}", dat.to_string());
+        println!("Supported laptop functions:\n{}", dat);
    }

    if let Some(fan_level) = parsed.fan_mode {
@@ -268,13 +237,19 @@ fn print_supported_help(supported: &SupportedFunctions, parsed: &CLIStart) {
    let commands: Vec<String> = CliCommand::usage().lines().map(|s| s.to_string()).collect();
    println!("\nCommands available");
    for line in commands.iter().filter(|line| {
-        if line.contains("profile") && !supported.fan_cpu_ctrl.stock_fan_modes && !supported.fan_cpu_ctrl.fan_curve_set {
+        if line.contains("profile")
+            && !supported.fan_cpu_ctrl.stock_fan_modes
+            && !supported.fan_cpu_ctrl.fan_curve_set
+        {
            return false;
        }
        if line.contains("led-mode") && supported.keyboard_led.stock_led_modes.is_none() {
            return false;
        }
-        if line.contains("bios") && (!supported.rog_bios_ctrl.dedicated_gfx_toggle || !supported.rog_bios_ctrl.post_sound_toggle) {
+        if line.contains("bios")
+            && (!supported.rog_bios_ctrl.dedicated_gfx_toggle
+                || !supported.rog_bios_ctrl.post_sound_toggle)
+        {
            return false;
        }
        if line.contains("anime") && !supported.anime_ctrl.0 {
@@ -294,59 +269,45 @@ fn print_supported_help(supported: &SupportedFunctions, parsed: &CLIStart) {
 }

 fn do_gfx(
-    dbus_client: &AuraDbusClient,
+    dbus: &AuraDbusClient,
+    supported: &RogBiosSupportedFunctions,
    command: GraphicsCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    if command.mode.is_none() || command.help {
+    if command.mode.is_none() && !command.get && !command.pow && !command.force || command.help {
        println!("{}", command.self_usage());
    }

    if let Some(mode) = command.mode {
-        println!("Changing graphics modes...");
-        println!("If this takes longer than 30s, ctrl+c then check `journalctl -b -u asusd`");
-
-        if do_gfx_action(
-            command.force,
-            "This will restart your display-manager. Please save all work!",
-            "Setting graphics mode...",
-        ) {
-            dbus_client.proxies().gfx().gfx_write_mode(mode.into())?;
-            let res = dbus_client.gfx_wait_changed()?;
-            println!("{}", res);
-            std::process::exit(1)
+        if supported.dedicated_gfx_toggle && dbus.proxies().rog_bios().get_dedicated_gfx()? == 1 {
+            println!("You can not change modes until you turn dedicated/G-Sync off and reboot");
+            std::process::exit(-1);
        }
-        std::process::exit(-1)
+
+        println!(
+            "Your display-manager will restart in requested mode when all users are logged out"
+        );
+        println!("If anything fails check `journalctl -b -u asusd`");
+
+        dbus.proxies().gfx().gfx_write_mode(mode.into())?;
+        let res = dbus.gfx_wait_changed()?;
+        println!("{}", res);
+        std::process::exit(0)
    }
    if command.get {
-        let res = dbus_client.proxies().gfx().gfx_get_mode()?;
+        let res = dbus.proxies().gfx().gfx_get_mode()?;
        println!("Current graphics mode: {}", res);
    }
    if command.pow {
-        let res = dbus_client.proxies().gfx().gfx_get_pwr()?;
+        let res = dbus.proxies().gfx().gfx_get_pwr()?;
        if res.contains("active") {
-            println!("Current power status: {}", Red.paint(&format!("{}", res)));
+            println!("Current power status: {}", Red.paint(&res));
        } else {
-            println!("Current power status: {}", Green.paint(&format!("{}", res)));
+            println!("Current power status: {}", Green.paint(&res));
        }
    }
    Ok(())
 }

-fn do_gfx_action(no_confirm: bool, ask_msg: &str, ok_msg: &str) -> bool {
-    println!("{}", Red.paint(&format!("{} Continue?", ask_msg)));
-
-    let mut buf = String::new();
-
-    std::io::stdin().read_line(&mut buf).expect("Input failed");
-    let input = buf.chars().next().unwrap() as char;
-
-    if input == 'Y' || input == 'y' || no_confirm {
-        println!("{}", Green.paint(&format!("{}", ok_msg)));
-        return true;
-    }
-    false
-}
-
 fn handle_led_mode(
    dbus: &AuraDbusClient,
    supported: &LedSupportedFunctions,
@@ -359,10 +320,14 @@ fn handle_led_mode(
        println!("{}\n", mode.self_usage());
        println!("Commands available");

-        let commands: Vec<String> = LedModeCommand::command_list().unwrap().lines().map(|s| s.to_string()).collect();
+        let commands: Vec<String> = LedModeCommand::command_list()
+            .unwrap()
+            .lines()
+            .map(|s| s.to_string())
+            .collect();
        for (_, command) in commands.iter().enumerate().filter(|(mode_num, _)| {
            if let Some(modes) = supported.stock_led_modes.as_ref() {
-                return modes.contains(&(*mode_num as u8))
+                return modes.contains(&(*mode_num as u8));
            }
            false
        }) {
@@ -370,17 +335,25 @@ fn handle_led_mode(
        }

        println!("\nHelp can also be requested on modes, e.g: static --help");
-        std::process::exit(1);
+        return Ok(());
    }
+
    if mode.next_mode && mode.prev_mode {
-        println!("Please specify either next or previous")
+        println!("Please specify either next or previous");
+        return Ok(());
    }
    if mode.next_mode {
        dbus.proxies().led().next_led_mode()?;
    } else if mode.prev_mode {
        dbus.proxies().led().prev_led_mode()?;
-    } else if let Some(command) = mode.command.as_ref() {
-        dbus.proxies().led().set_led_mode(&command.into())?
+    } else if let Some(mode) = mode.command.as_ref() {
+        if mode.help_requested() {
+            println!("{}", mode.self_usage());
+            return Ok(());
+        }
+        dbus.proxies()
+            .led()
+            .set_led_mode(&<AuraModes>::from(mode))?;
    }
    Ok(())
 }
@@ -402,10 +375,14 @@ fn handle_profile(
        if !cmd.help {
            println!("Missing arg or command\n");
        }
-        let usage: Vec<String> = ProfileCommand::usage().lines().map(|s| s.to_string()).collect();
-        for line in usage.iter().filter(|line| {
-            !(line.contains("--curve") && !supported.fan_curve_set)
-        }) {
+        let usage: Vec<String> = ProfileCommand::usage()
+            .lines()
+            .map(|s| s.to_string())
+            .collect();
+        for line in usage
+            .iter()
+            .filter(|line| !line.contains("--curve") || supported.fan_curve_set)
+        {
            println!("{}", line);
        }

@@ -424,3 +401,57 @@ fn handle_profile(

    Ok(())
 }
+
+fn handle_bios_option(
+    dbus: &AuraDbusClient,
+    supported: &RogBiosSupportedFunctions,
+    cmd: &BiosCommand,
+) -> Result<(), Box<dyn std::error::Error>> {
+    {
+        if (cmd.dedicated_gfx_set.is_none()
+            && !cmd.dedicated_gfx_get
+            && cmd.post_sound_set.is_none()
+            && !cmd.post_sound_get)
+            || cmd.help
+        {
+            println!("Missing arg or command\n");
+
+            let usage: Vec<String> = BiosCommand::usage()
+                .lines()
+                .map(|s| s.to_string())
+                .collect();
+
+            for line in usage.iter().filter(|line| {
+                !(line.contains("sound") && !supported.post_sound_toggle)
+                    || !(line.contains("GPU") && !supported.dedicated_gfx_toggle)
+            }) {
+                println!("{}", line);
+            }
+        }
+
+        if let Some(opt) = cmd.post_sound_set {
+            dbus.proxies().rog_bios().set_post_sound(opt)?;
+        }
+        if cmd.post_sound_get {
+            let res = dbus.proxies().rog_bios().get_post_sound()? == 1;
+            println!("Bios POST sound on: {}", res);
+        }
+        if let Some(opt) = cmd.dedicated_gfx_set {
+            println!("Rebuilding initrd to include drivers");
+            dbus.proxies().rog_bios().set_dedicated_gfx(opt)?;
+            println!("The mode change is not active until you reboot, on boot the bios will make the required change");
+            if opt {
+                println!(
+                    "NOTE: on reboot your display manager will be forced to use Nvidia drivers"
+                );
+            } else {
+                println!("NOTE: after reboot you can then select regular graphics modes");
+            }
+        }
+        if cmd.dedicated_gfx_get {
+            let res = dbus.proxies().rog_bios().get_dedicated_gfx()? == 1;
+            println!("Bios dedicated GPU on: {}", res);
+        }
+    }
+    Ok(())
+}
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "daemon"
-version = "3.1.4"
+version = "3.1.7"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
@@ -27,8 +27,9 @@ udev = "^0.6"
 log = "^0.4"
 env_logger = "^0.8"

-zbus = "^1.8"
-zvariant = "^2.4"
+zbus = "^2.0.0-beta.3"
+zvariant = "^2.5"
+logind-zbus = "*"

 # serialisation
 serde = "^1.0"
@@ -40,4 +41,4 @@ toml = "^0.5"
 sysfs-class = "^0.1.2" # used for backlight control and baord ID
 rog_fan_curve = { version = "0.1", features = ["serde"] }
 # cpu power management
-intel-pstate = "^0.2"
+intel-pstate = "^0.2"
--- a/daemon/src/config.rs
+++ b/daemon/src/config.rs
@@ -56,10 +56,12 @@ impl Config {
            .write(true)
            .create(true)
            .open(&CONFIG_PATH)
-            .expect(&format!(
-                "The file {} or directory /etc/asusd/ is missing",
-                CONFIG_PATH
-            )); // okay to cause panic here
+            .unwrap_or_else(|_| {
+                panic!(
+                    "The file {} or directory /etc/asusd/ is missing",
+                    CONFIG_PATH
+                )
+            }); // okay to cause panic here
        let mut buf = String::new();
        if let Ok(read_len) = file.read_to_string(&mut buf) {
            if read_len == 0 {
--- a/daemon/src/ctrl_anime.rs
+++ b/daemon/src/ctrl_anime.rs
@@ -21,7 +21,6 @@ use rog_types::{
    error::AuraError,
 };
 use rusb::{Device, DeviceHandle};
-use std::convert::TryInto;
 use std::error::Error;
 use std::time::Duration;
 use zbus::dbus_interface;
@@ -60,7 +59,7 @@ pub trait Dbus {
 impl crate::ZbusAdd for CtrlAnimeDisplay {
    fn add_to_server(self, server: &mut zbus::ObjectServer) {
        server
-            .at(&"/org/asuslinux/Anime".try_into().unwrap(), self)
+            .at("/org/asuslinux/Anime", self)
            .map_err(|err| {
                warn!("CtrlAnimeDisplay: add_to_server {}", err);
                err
--- a/daemon/src/ctrl_charge.rs
+++ b/daemon/src/ctrl_charge.rs
@@ -2,7 +2,6 @@ use crate::{config::Config, error::RogError, GetSupported};
 //use crate::dbus::DbusEvents;
 use log::{info, warn};
 use serde_derive::{Deserialize, Serialize};
-use std::convert::TryInto;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
@@ -64,7 +63,7 @@ impl CtrlCharge {
 impl crate::ZbusAdd for CtrlCharge {
    fn add_to_server(self, server: &mut zbus::ObjectServer) {
        server
-            .at(&"/org/asuslinux/Charge".try_into().unwrap(), self)
+            .at("/org/asuslinux/Charge", self)
            .map_err(|err| {
                warn!("CtrlCharge: add_to_server {}", err);
                err
--- a/daemon/src/ctrl_fan_cpu.rs
+++ b/daemon/src/ctrl_fan_cpu.rs
@@ -6,7 +6,6 @@ use crate::{
 use log::{info, warn};
 use rog_types::profile::{FanLevel, ProfileEvent};
 use serde_derive::{Deserialize, Serialize};
-use std::convert::TryInto;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
@@ -135,7 +134,7 @@ impl DbusFanAndCpu {
 impl crate::ZbusAdd for DbusFanAndCpu {
    fn add_to_server(self, server: &mut zbus::ObjectServer) {
        server
-            .at(&"/org/asuslinux/Profile".try_into().unwrap(), self)
+            .at("/org/asuslinux/Profile", self)
            .map_err(|err| {
                warn!("DbusFanAndCpu: add_to_server {}", err);
                err
--- a/daemon/src/ctrl_gfx/error.rs
+++ b/daemon/src/ctrl_gfx/error.rs
@@ -1,5 +1,5 @@
-use std::error;
 use std::fmt;
+use std::{error, process::ExitStatus};

 use crate::error::RogError;

@@ -7,7 +7,9 @@ use crate::error::RogError;
 pub enum GfxError {
    ParseVendor,
    Bus(String, std::io::Error),
-    DisplayManager(String),
+    DisplayManagerAction(String, ExitStatus),
+    DisplayManagerTimeout(String),
+    GsyncModeActive,
 }

 impl fmt::Display for GfxError {
@@ -16,7 +18,16 @@ impl fmt::Display for GfxError {
        match self {
            GfxError::ParseVendor => write!(f, "Could not parse vendor name"),
            GfxError::Bus(func, error) => write!(f, "Bus error: {}: {}", func, error),
-            GfxError::DisplayManager(detail) => write!(f, "Display manager: {}", detail),
+            GfxError::DisplayManagerAction(action, status) => {
+                write!(f, "Display-manager action {} failed: {}", action, status)
+            }
+            GfxError::DisplayManagerTimeout(state) => {
+                write!(f, "Timed out waiting for display-manager {} state", state)
+            }
+            GfxError::GsyncModeActive => write!(
+                f,
+                "Can not switch gfx modes when dedicated/G-Sync mode is active"
+            ),
        }
    }
 }
--- a/daemon/src/ctrl_gfx/gfx.rs
+++ b/daemon/src/ctrl_gfx/gfx.rs
@@ -1,18 +1,25 @@
 use ctrl_gfx::error::GfxError;
 use ctrl_gfx::*;
+use ctrl_rog_bios::CtrlRogBios;
 use log::{error, info, warn};
+use logind_zbus::{
+    types::{SessionClass, SessionInfo, SessionType},
+    ManagerProxy, SessionProxy,
+};
 use rog_types::gfx_vendors::GfxVendors;
-use std::iter::FromIterator;
-use std::process::Command;
-use std::str::FromStr;
-use std::{io::Write, ops::Add, path::Path};
+use std::{io::Write, ops::Add, path::Path, time::Instant};
+use std::{iter::FromIterator, thread::JoinHandle};
+use std::{process::Command, thread::sleep, time::Duration};
+use std::{str::FromStr, sync::mpsc};
 use std::{sync::Arc, sync::Mutex};
 use sysfs_class::{PciDevice, SysClass};
 use system::{GraphicsDevice, PciBus};
-use zbus::dbus_interface;
+use zbus::{dbus_interface, Connection};

 use crate::*;

+const THREAD_TIMEOUT_MSG: &str = "GFX: thread time exceeded 3 minutes, exiting";
+
 pub struct CtrlGraphics {
    bus: PciBus,
    _amd: Vec<GraphicsDevice>,
@@ -21,6 +28,7 @@ pub struct CtrlGraphics {
    #[allow(dead_code)]
    other: Vec<GraphicsDevice>,
    config: Arc<Mutex<Config>>,
+    thread_kill: Arc<Mutex<Option<mpsc::Sender<bool>>>>,
 }

 trait Dbus {
@@ -31,8 +39,6 @@ trait Dbus {
    fn notify_action(&self, action: &str) -> zbus::Result<()>;
 }

-use std::convert::TryInto;
-
 #[dbus_interface(name = "org.asuslinux.Daemon")]
 impl Dbus for CtrlGraphics {
    fn vendor(&self) -> String {
@@ -47,15 +53,15 @@ impl Dbus for CtrlGraphics {

    fn set_vendor(&mut self, vendor: String) {
        if let Ok(tmp) = GfxVendors::from_str(&vendor) {
-            info!("Switching gfx mode to {}", vendor);
+            info!("GFX: Switching gfx mode to {}", vendor);
            let msg = self.set_gfx_config(tmp).unwrap_or_else(|err| {
-                error!("{}", err);
+                error!("GFX: {}", err);
                format!("Failed: {}", err.to_string())
            });
            self.notify_gfx(&vendor)
-                .unwrap_or_else(|err| warn!("{}", err));
+                .unwrap_or_else(|err| warn!("GFX: {}", err));
            self.notify_action(&msg)
-                .unwrap_or_else(|err| warn!("{}", err));
+                .unwrap_or_else(|err| warn!("GFX: {}", err));
        }
    }

@@ -69,14 +75,9 @@ impl Dbus for CtrlGraphics {
 impl ZbusAdd for CtrlGraphics {
    fn add_to_server(self, server: &mut zbus::ObjectServer) {
        server
-            .at(
-                &"/org/asuslinux/Gfx"
-                    .try_into()
-                    .expect("Couldn't add to zbus"),
-                self,
-            )
+            .at("/org/asuslinux/Gfx", self)
            .map_err(|err| {
-                warn!("CtrlGraphics: add_to_server {}", err);
+                warn!("GFX: CtrlGraphics: add_to_server {}", err);
                err
            })
            .ok();
@@ -86,7 +87,7 @@ impl ZbusAdd for CtrlGraphics {
 impl Reloadable for CtrlGraphics {
    fn reload(&mut self) -> Result<(), RogError> {
        self.auto_power()?;
-        info!("Reloaded gfx mode: {:?}", self.get_gfx_mode()?);
+        info!("GFX: Reloaded gfx mode: {:?}", self.get_gfx_mode()?);
        Ok(())
    }
 }
@@ -95,7 +96,7 @@ impl CtrlGraphics {
    pub fn new(config: Arc<Mutex<Config>>) -> std::io::Result<CtrlGraphics> {
        let bus = PciBus::new()?;

-        info!("Rescanning PCI bus");
+        info!("GFX: Rescanning PCI bus");
        bus.rescan()?;

        let devs = PciDevice::all()?;
@@ -106,7 +107,7 @@ impl CtrlGraphics {
                for func in devs.iter() {
                    if let Some(func_slot) = func.id().split('.').next() {
                        if func_slot == parent_slot {
-                            info!("{}: Function for {}", func.id(), parent.id());
+                            info!("GFX: {}: Function for {}", func.id(), parent.id());
                            functions.push(func.clone());
                        }
                    }
@@ -124,19 +125,19 @@ impl CtrlGraphics {
            if 0x03 == (c >> 16) & 0xFF {
                match dev.vendor()? {
                    0x1002 => {
-                        info!("{}: AMD graphics", dev.id());
+                        info!("GFX: {}: AMD graphics", dev.id());
                        amd.push(GraphicsDevice::new(dev.id().to_owned(), functions(&dev)));
                    }
                    0x10DE => {
-                        info!("{}: NVIDIA graphics", dev.id());
+                        info!("GFX: {}: NVIDIA graphics", dev.id());
                        nvidia.push(GraphicsDevice::new(dev.id().to_owned(), functions(&dev)));
                    }
                    0x8086 => {
-                        info!("{}: Intel graphics", dev.id());
+                        info!("GFX: {}: Intel graphics", dev.id());
                        intel.push(GraphicsDevice::new(dev.id().to_owned(), functions(&dev)));
                    }
                    vendor => {
-                        info!("{}: Other({:X}) graphics", dev.id(), vendor);
+                        info!("GFX: {}: Other({:X}) graphics", dev.id(), vendor);
                        other.push(GraphicsDevice::new(dev.id().to_owned(), functions(&dev)));
                    }
                }
@@ -150,23 +151,30 @@ impl CtrlGraphics {
            nvidia,
            other,
            config,
+            thread_kill: Arc::new(Mutex::new(None)),
        })
    }

-    fn save_gfx_mode(&self, vendor: GfxVendors) -> Result<(), RogError> {
-        if let Ok(mut config) = self.config.lock() {
-            config.gfx_mode = vendor.clone();
+    pub fn bus(&self) -> PciBus {
+        self.bus.clone()
+    }
+
+    pub fn devices(&self) -> Vec<GraphicsDevice> {
+        self.nvidia.clone()
+    }
+
+    fn save_gfx_mode(vendor: GfxVendors, config: Arc<Mutex<Config>>) {
+        if let Ok(mut config) = config.lock() {
+            config.gfx_mode = vendor;
            config.write();
-            return Ok(());
        }
        // TODO: Error here
-        Ok(())
    }

    /// Associated method to get which vendor mode is set
    pub fn get_gfx_mode(&self) -> Result<GfxVendors, RogError> {
        if let Ok(config) = self.config.lock() {
-            return Ok(config.gfx_mode.clone());
+            return Ok(config.gfx_mode);
        }
        // TODO: Error here
        Ok(GfxVendors::Hybrid)
@@ -180,10 +188,10 @@ impl CtrlGraphics {

    fn toggle_fallback_service(vendor: GfxVendors) -> Result<(), RogError> {
        let action = if vendor == GfxVendors::Nvidia {
-            info!("Enabling nvidia-fallback.service");
+            info!("GFX: Enabling nvidia-fallback.service");
            "enable"
        } else {
-            info!("Disabling nvidia-fallback.service");
+            info!("GFX: Disabling nvidia-fallback.service");
            "disable"
        };

@@ -216,7 +224,7 @@ impl CtrlGraphics {
        }

        let file = XORG_PATH.to_string().add(XORG_FILE);
-        info!("Writing {}", file);
+        info!("GFX: Writing {}", file);
        let mut file = std::fs::OpenOptions::new()
            .create(true)
            .truncate(true)
@@ -231,7 +239,7 @@ impl CtrlGraphics {
    }

    fn write_modprobe_conf() -> Result<(), RogError> {
-        info!("Writing {}", MODPROBE_PATH);
+        info!("GFX: Writing {}", MODPROBE_PATH);

        let mut file = std::fs::OpenOptions::new()
            .create(true)
@@ -247,12 +255,12 @@ impl CtrlGraphics {
        Ok(())
    }

-    fn unbind_remove_nvidia(&self) -> Result<(), RogError> {
+    fn unbind_remove_nvidia(devices: &[GraphicsDevice]) -> Result<(), RogError> {
        // Unbind NVIDIA graphics devices and their functions
-        let unbinds = self.nvidia.iter().map(|dev| dev.unbind());
+        let unbinds = devices.iter().map(|dev| dev.unbind());

        // Remove NVIDIA graphics devices and their functions
-        let removes = self.nvidia.iter().map(|dev| dev.remove());
+        let removes = devices.iter().map(|dev| dev.remove());

        Result::from_iter(unbinds.chain(removes))
            .map_err(|err| RogError::Command("device unbind error".into(), err))?;
@@ -260,8 +268,28 @@ impl CtrlGraphics {
        Ok(())
    }

+    fn log_uses_of_nvidia() {
+        // lsof /dev/nvidia*
+        let mut cmd = Command::new("lsof");
+        cmd.arg("/dev/nvidia*");
+
+        match cmd.output() {
+            Ok(output) => {
+                if !output.status.success() {
+                    error!(
+                        "Failed to list uses of nvidia devices: {}",
+                        String::from_utf8_lossy(&output.stderr)
+                    );
+                } else if output.status.success() {
+                    warn!("GFX: {}", String::from_utf8_lossy(&output.stdout));
+                }
+            }
+            Err(err) => error!("GFX: Failed to list uses of nvidia devices: {}", err),
+        }
+    }
+
    fn do_driver_action(driver: &str, action: &str) -> Result<(), RogError> {
-        let mut cmd= Command::new(action);
+        let mut cmd = Command::new(action);
        cmd.arg(driver);

        let mut count = 0;
@@ -269,29 +297,42 @@ impl CtrlGraphics {
        loop {
            if count > MAX_TRIES {
                let msg = format!("{} {} failed for unknown reason", action, driver);
-                error!("{}", msg);
-                return Ok(()) //Err(RogError::Modprobe(msg));
+                error!("GFX: {}", msg);
+                return Ok(()); //Err(RogError::Modprobe(msg));
            }

            let output = cmd
                .output()
                .map_err(|err| RogError::Command(format!("{:?}", cmd), err))?;
            if !output.status.success() {
-                if output.stderr.ends_with("is not currently loaded\n".as_bytes()) {
-                    return Ok(())
+                if output
+                    .stderr
+                    .ends_with("is not currently loaded\n".as_bytes())
+                {
+                    return Ok(());
                }
                if output.stderr.ends_with("Permission denied\n".as_bytes()) {
-                    let msg = format!("{} {} failed: {:?}", action, driver, String::from_utf8_lossy(&output.stderr));
-                    warn!("{}", msg);
-                    warn!("It may be safe to ignore the above error, run `lsmod |grep nvidia` to confirm modules loaded");
-                    return Ok(())
+                    let msg = format!(
+                        "{} {} failed: {:?}",
+                        action,
+                        driver,
+                        String::from_utf8_lossy(&output.stderr)
+                    );
+                    warn!("GFX: {}", msg);
+                    warn!("GFX: It may be safe to ignore the above error, run `lsmod |grep nvidia` to confirm modules loaded");
+                    return Ok(());
                }
                if count >= MAX_TRIES {
-                    let msg = format!("{} {} failed: {:?}", action, driver, String::from_utf8_lossy(&output.stderr));
+                    let msg = format!(
+                        "{} {} failed: {:?}",
+                        action,
+                        driver,
+                        String::from_utf8_lossy(&output.stderr)
+                    );
                    return Err(RogError::Modprobe(msg));
                }
            } else if output.status.success() {
-                return Ok(())
+                return Ok(());
            }

            count += 1;
@@ -312,7 +353,7 @@ impl CtrlGraphics {
                "systemctl {} {} failed: {:?}",
                action, DISPLAY_MANAGER, status
            );
-            return Err(GfxError::DisplayManager(msg).into());
+            return Err(GfxError::DisplayManagerAction(msg, status).into());
        }
        Ok(())
    }
@@ -334,24 +375,37 @@ impl CtrlGraphics {
            std::thread::sleep(std::time::Duration::from_millis(500));
            count += 1;
        }
-        return Err(
-            GfxError::DisplayManager(format!("display-manager timed out waiting for {} state", state).into()).into(),
-        );
+        Err(GfxError::DisplayManagerTimeout(state.into()).into())
    }

-    pub fn do_vendor_tasks(&mut self, vendor: GfxVendors) -> Result<(), RogError> {
+    /// Write the config changes and add/remove drivers and devices depending
+    /// on selected mode:
+    ///
+    /// Tasks:
+    /// - write xorg config
+    /// - write modprobe config
+    /// - rescan for devices
+    ///   + add drivers
+    ///   + or remove drivers and devices
+    pub fn do_vendor_tasks(
+        vendor: GfxVendors,
+        devices: &[GraphicsDevice],
+        bus: &PciBus,
+    ) -> Result<(), RogError> {
        Self::write_xorg_conf(vendor)?;
        Self::write_modprobe_conf()?; // TODO: Not required here, should put in startup?

        // Rescan before doing remove or add drivers
-        self.bus
-            .rescan()
+        bus.rescan()
            .map_err(|err| GfxError::Bus("bus rescan error".into(), err))?;

        match vendor {
            GfxVendors::Nvidia | GfxVendors::Hybrid | GfxVendors::Compute => {
                for driver in NVIDIA_DRIVERS.iter() {
-                    Self::do_driver_action(driver, "modprobe")?;
+                    Self::do_driver_action(driver, "modprobe").map_err(|err| {
+                        Self::log_uses_of_nvidia();
+                        err
+                    })?;
                }
            }
            // TODO: compute mode, needs different setup
@@ -360,26 +414,151 @@ impl CtrlGraphics {
                for driver in NVIDIA_DRIVERS.iter() {
                    Self::do_driver_action(driver, "rmmod")?;
                }
-                self.unbind_remove_nvidia()?;
+                Self::unbind_remove_nvidia(&devices)?;
            }
        }

-        self.save_gfx_mode(vendor)?;
        Ok(())
    }

-    /// For manually calling (not on boot/startup)
-    ///
-    /// Will stop and start display manager without warning
-    pub fn set_gfx_config(&mut self, vendor: GfxVendors) -> Result<String, RogError> {
-        Self::do_display_manager_action("stop")?;
-        Self::wait_display_manager_state("inactive")?;
-        self.do_vendor_tasks(vendor)?;
-        Self::do_display_manager_action("start")?;
-        if Self::wait_display_manager_state("active").is_err() {
-            Self::do_display_manager_action("restart")?;
+    fn graphical_session_active(
+        connection: &Connection,
+        sessions: &[SessionInfo],
+    ) -> Result<bool, RogError> {
+        for session in sessions {
+            let session_proxy = SessionProxy::new(&connection, session)?;
+            if session_proxy.get_class()? == SessionClass::User {
+                match session_proxy.get_type()? {
+                    SessionType::X11 | SessionType::Wayland | SessionType::MIR => {
+                        if session_proxy.get_active()? {
+                            return Ok(true);
+                        }
+                    }
+                    _ => {}
+                }
+            }
        }
-        Self::wait_display_manager_state("active")?;
+        Ok(false)
+    }
+
+    /// Spools until all user sessions are ended then switches to requested mode
+    fn fire_starter(
+        vendor: GfxVendors,
+        devices: Vec<GraphicsDevice>,
+        bus: PciBus,
+        thread_stop: mpsc::Receiver<bool>,
+    ) -> Result<String, RogError> {
+        info!("GFX: display-manager thread started");
+
+        const SLEEP_PERIOD: Duration = Duration::from_millis(100);
+        let start_time = Instant::now();
+
+        let connection = Connection::new_system()?;
+        let manager = ManagerProxy::new(&connection)?;
+        let mut sessions = manager.list_sessions()?;
+
+        loop {
+            let tmp = manager.list_sessions()?;
+            if !tmp.iter().eq(&sessions) {
+                warn!("GFX: Sessions list changed");
+                warn!("GFX: Old list:\n{:?}\nNew list:\n{:?}", &sessions, &tmp);
+                sessions = tmp;
+            }
+
+            if !Self::graphical_session_active(&connection, &sessions)? {
+                break;
+            }
+
+            if let Ok(stop) = thread_stop.try_recv() {
+                if stop {
+                    return Ok("Graphics mode change was cancelled".into());
+                }
+            }
+            // exit if 3 minutes pass
+            if Instant::now().duration_since(start_time).as_secs() > 180 {
+                warn!("{}", THREAD_TIMEOUT_MSG);
+                return Ok(THREAD_TIMEOUT_MSG.into());
+            }
+
+            // Don't spin at max speed
+            sleep(SLEEP_PERIOD);
+        }
+
+        info!("GFX: all graphical user sessions ended, continuing");
+        Self::do_display_manager_action("stop")?;
+
+        match Self::wait_display_manager_state("inactive") {
+            Ok(_) => info!("GFX: display-manager stopped"),
+            Err(err) => {
+                warn!("GFX: {}", err);
+                warn!("GFX: Retry stop display manager");
+                Self::do_display_manager_action("stop")?;
+                Self::wait_display_manager_state("inactive")?;
+            }
+        }
+
+        Self::do_vendor_tasks(vendor, &devices, &bus)?;
+        Self::do_display_manager_action("start")?;
+
+        if Self::wait_display_manager_state("active").is_err() {
+            error!("GFX: display-manager failed to start normally, attempting restart");
+            Self::do_display_manager_action("restart")?;
+            Self::wait_display_manager_state("active")?;
+        }
+        info!("GFX: display-manager started");
+
+        let v: &str = vendor.into();
+        info!("GFX: Graphics mode changed to {} successfully", v);
+        Ok(format!("Graphics mode changed to {} successfully", v))
+    }
+
+    /// Initiates a mode change by starting a thread that will wait until all
+    /// graphical sessions are exited before performing the tasks required
+    /// to switch modes.
+    ///
+    /// For manually calling (not on boot/startup) via dbus
+    pub fn set_gfx_config(&mut self, vendor: GfxVendors) -> Result<String, RogError> {
+        if let Ok(gsync) = CtrlRogBios::get_gfx_mode() {
+            if gsync == 1 {
+                return Err(GfxError::GsyncModeActive.into());
+            }
+        }
+
+        if let Ok(lock) = self.thread_kill.lock() {
+            if let Some(tx) = lock.as_ref() {
+                // Cancel the running thread
+                info!("GFX: Cancelling previous thread");
+                tx.send(true)
+                    .map_err(|err| {
+                        warn!("GFX: {}", err);
+                    })
+                    .ok();
+            }
+        }
+
+        let devices = self.nvidia.clone();
+        let bus = self.bus.clone();
+        let (tx, rx) = mpsc::channel();
+        if let Ok(mut lock) = self.thread_kill.lock() {
+            *lock = Some(tx);
+        }
+        let killer = self.thread_kill.clone();
+
+        // Save selected mode in case of reboot
+        Self::save_gfx_mode(vendor, self.config.clone());
+
+        let _join: JoinHandle<()> = std::thread::spawn(move || {
+            Self::fire_starter(vendor, devices, bus, rx)
+                .map_err(|err| {
+                    error!("GFX: {}", err);
+                })
+                .ok();
+            // clear the tx/rx when done
+            if let Ok(mut lock) = killer.try_lock() {
+                *lock = None;
+            }
+        });
+
        // TODO: undo if failed? Save last mode, catch errors...
        let v: &str = vendor.into();
        Ok(format!("Graphics mode changed to {} successfully", v))
@@ -390,12 +569,12 @@ impl CtrlGraphics {
    //         // Switch to dedicated if config says to do so
    //         if config.gfx_nv_mode_is_dedicated && vendor == GfxVendors::Nvidia {
    //             CtrlRogBios::set_gfx_mode(true)
-    //                 .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
+    //                 .unwrap_or_else(|err| warn!("GFX: Gfx controller: {}", err));
    //         } else if let Ok(ded) = CtrlRogBios::get_gfx_mode() {
    //             // otherwise if switching to non-Nvidia mode turn off dedicated mode
    //             if ded == 1 && vendor != GfxVendors::Nvidia {
    //                 CtrlRogBios::set_gfx_mode(false)
-    //                     .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
+    //                     .unwrap_or_else(|err| warn!("GFX: Gfx controller: {}", err));
    //             }
    //         }
    //     }
@@ -403,7 +582,9 @@ impl CtrlGraphics {

    fn auto_power(&mut self) -> Result<(), RogError> {
        let vendor = self.get_gfx_mode()?;
-        self.do_vendor_tasks(vendor)?;
+        let devices = self.nvidia.clone();
+        let bus = self.bus.clone();
+        Self::do_vendor_tasks(vendor, &devices, &bus)?;
        Self::toggle_fallback_service(vendor)?;
        Ok(())
    }
--- a/daemon/src/ctrl_gfx/mod.rs
+++ b/daemon/src/ctrl_gfx/mod.rs
@@ -11,6 +11,8 @@ const DISPLAY_MANAGER: &str = "display-manager.service";
 const MODPROBE_PATH: &str = "/etc/modprobe.d/asusd.conf";

 static MODPROBE_BASE: &[u8] = br#"# Automatically generated by asusd
+# If you have issues with i2c_nvidia_gpu, copy the 2 lines below to a
+# new blacklist file and uncomment
 #blacklist i2c_nvidia_gpu
 #alias i2c_nvidia_gpu off
 blacklist nouveau
--- a/daemon/src/ctrl_gfx/system.rs
+++ b/daemon/src/ctrl_gfx/system.rs
@@ -33,6 +33,7 @@ impl Module {
    }
 }

+#[derive(Clone)]
 pub struct PciBus {
    path: PathBuf,
 }
@@ -56,6 +57,7 @@ impl PciBus {
    }
 }

+#[derive(Clone)]
 pub struct GraphicsDevice {
    _id: String,
    functions: Vec<PciDevice>,
--- a/daemon/src/ctrl_leds.rs
+++ b/daemon/src/ctrl_leds.rs
@@ -18,9 +18,9 @@ use rog_types::{
 };
 use std::fs::OpenOptions;
 use std::io::{Read, Write};
+use std::path::Path;
 use std::sync::Arc;
 use std::sync::Mutex;
-use std::{convert::TryInto, path::Path};
 use zbus::dbus_interface;

 use crate::GetSupported;
@@ -88,7 +88,7 @@ trait Dbus {
 impl crate::ZbusAdd for DbusKbdBacklight {
    fn add_to_server(self, server: &mut zbus::ObjectServer) {
        server
-            .at(&"/org/asuslinux/Led".try_into().unwrap(), self)
+            .at("/org/asuslinux/Led", self)
            .map_err(|err| {
                error!("DbusKbdBacklight: add_to_server {}", err);
            })
--- a/daemon/src/ctrl_rog_bios.rs
+++ b/daemon/src/ctrl_rog_bios.rs
@@ -2,12 +2,12 @@ use crate::{config::Config, error::RogError, GetSupported};
 use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
 use std::fs::OpenOptions;
+use std::io::BufRead;
 use std::io::{Read, Write};
 use std::path::Path;
 use std::process::Command;
 use std::sync::Arc;
 use std::sync::Mutex;
-use std::{convert::TryInto, io::BufRead};
 use zbus::dbus_interface;

 const INITRAMFS_PATH: &str = "/usr/sbin/update-initramfs";
@@ -101,7 +101,7 @@ impl CtrlRogBios {
 impl crate::ZbusAdd for CtrlRogBios {
    fn add_to_server(self, server: &mut zbus::ObjectServer) {
        server
-            .at(&"/org/asuslinux/RogBios".try_into().unwrap(), self)
+            .at("/org/asuslinux/RogBios", self)
            .map_err(|err| {
                warn!("CtrlRogBios: add_to_server {}", err);
                err
@@ -136,9 +136,7 @@ impl CtrlRogBios {
            }
        }

-        Ok(CtrlRogBios {
-            _config: config,
-        })
+        Ok(CtrlRogBios { _config: config })
    }

    fn set_path_mutable(path: &str) -> Result<(), RogError> {
@@ -271,6 +269,7 @@ impl CtrlRogBios {
        } else if Path::new(DRACUT_PATH).exists() {
            let mut cmd = Command::new("dracut");
            cmd.arg("-f");
+            cmd.arg("-q");
            initfs_cmd = Some(cmd);
            info!("Using initramfs update command 'dracut'");
        }
@@ -335,7 +334,7 @@ impl CtrlRogBios {
                .map_err(|err| RogError::Write(format!("{:?}", cmd), err))?;
            if !status.success() {
                error!("Ram disk update failed");
-                return Err(RogError::Initramfs("Ram disk update failed".into()).into());
+                return Err(RogError::Initramfs("Ram disk update failed".into()));
            } else {
                info!("Successfully updated initramfs");
            }
--- a/daemon/src/ctrl_supported.rs
+++ b/daemon/src/ctrl_supported.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use log::warn;
 use serde_derive::{Deserialize, Serialize};
 use zbus::dbus_interface;
@@ -32,7 +30,7 @@ impl SupportedFunctions {
 impl crate::ZbusAdd for SupportedFunctions {
    fn add_to_server(self, server: &mut zbus::ObjectServer) {
        server
-            .at(&"/org/asuslinux/Supported".try_into().unwrap(), self)
+            .at("/org/asuslinux/Supported", self)
            .map_err(|err| {
                warn!("SupportedFunctions: add_to_server {}", err);
                err
--- a/daemon/src/daemon.rs
+++ b/daemon/src/daemon.rs
@@ -19,7 +19,6 @@ use std::sync::Mutex;

 use daemon::ctrl_rog_bios::CtrlRogBios;
 use std::convert::Into;
-use std::convert::TryInto;
 use zbus::fdo;
 use zbus::Connection;

@@ -111,9 +110,10 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
                    if let Ok(ded) = CtrlRogBios::get_gfx_mode() {
                        if let Ok(vendor) = ctrl.get_gfx_mode() {
                            if ded == 1 && vendor != GfxVendors::Nvidia {
-                                error!("Dedicated GFX toggle is on but driver mode is not nvidia \nSetting to nvidia driver mode");
-                                error!("You must reboot to enable Nvidia driver");
-                                ctrl.do_vendor_tasks(GfxVendors::Nvidia)?;
+                                warn!("Dedicated GFX toggle is on but driver mode is not nvidia \nSetting to nvidia driver mode");
+                                let devices = ctrl.devices();
+                                let bus = ctrl.bus();
+                                CtrlGraphics::do_vendor_tasks(GfxVendors::Nvidia, &devices, &bus)?;
                            } else if ded == 0 {
                                info!("Dedicated GFX toggle is off");
                            }
@@ -179,7 +179,7 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
        });

    object_server
-        .with(&"/org/asuslinux/Charge".try_into()?, |obj: &CtrlCharge| {
+        .with("/org/asuslinux/Charge", |obj: &CtrlCharge| {
            let x = obj.limit();
            obj.notify_charge(x as u8)
        })
--- a/daemon/src/error.rs
+++ b/daemon/src/error.rs
@@ -28,6 +28,7 @@ pub enum RogError {
    Initramfs(String),
    Modprobe(String),
    Command(String, std::io::Error),
+    Zbus(zbus::Error),
 }

 impl fmt::Display for RogError {
@@ -54,6 +55,7 @@ impl fmt::Display for RogError {
            RogError::Initramfs(detail) => write!(f, "Initiramfs error: {}", detail),
            RogError::Modprobe(detail) => write!(f, "Modprobe error: {}", detail),
            RogError::Command(func, error) => write!(f, "Command exec error: {}: {}", func, error),
+            RogError::Zbus(detail) => write!(f, "Zbus error: {}", detail),
        }
    }
 }
@@ -79,3 +81,9 @@ impl From<GraphicsError> for RogError {
        }
    }
 }
+
+impl From<zbus::Error> for RogError {
+    fn from(err: zbus::Error) -> Self {
+        RogError::Zbus(err)
+    }
+}
--- a/daemon/src/laptops.rs
+++ b/daemon/src/laptops.rs
@@ -34,21 +34,19 @@ pub fn match_laptop() -> Option<LaptopBase> {
        let device_desc = device
            .device_descriptor()
            .expect("Couldn't get device descriptor");
-        if device_desc.vendor_id() == 0x0b05 {
-            if LAPTOP_DEVICES.contains(&device_desc.product_id()) {
-                let prod_str = format!("{:x?}", device_desc.product_id());
+        if device_desc.vendor_id() == 0x0b05 && LAPTOP_DEVICES.contains(&device_desc.product_id()) {
+            let prod_str = format!("{:x?}", device_desc.product_id());

-                if device_desc.product_id() == 0x1854 {
-                    let mut laptop = laptop(prod_str, None);
-                    if laptop.supported_modes.is_empty() {
-                        laptop.supported_modes = vec![STATIC, BREATHING];
-                    }
-                    return Some(laptop);
+            if device_desc.product_id() == 0x1854 {
+                let mut laptop = laptop(prod_str, None);
+                if laptop.supported_modes.is_empty() {
+                    laptop.supported_modes = vec![STATIC, BREATHING];
                }
-
-                let laptop = laptop(prod_str, Some("02".to_owned()));
                return Some(laptop);
            }
+
+            let laptop = laptop(prod_str, Some("02".to_owned()));
+            return Some(laptop);
        }
    }
    warn!(
--- a/data/completions/asusctl.fish
+++ b/data/completions/asusctl.fish
@@ -0,0 +1,77 @@
+# Author: AlenPaulVarghese <alenpaul2001@gmail.com>
+
+set -l progname asusctl
+
+set -l noopt "not __fish_contains_opt -s -s h -s v -s s -s k -s f -s c help version show-supported kbd-bright fan-mode chg-limit; and not __fish_seen_subcommand_from led-mode profile graphics;"
+
+
+set -l gmod_options '__fish_contains_opt -s m mode;'
+set -l fan_options '__fish_contains_opt -s f fan-mode;'
+set -l led_options '__fish_seen_subcommand_from led-mode;'
+set -l profile_options '__fish_seen_subcommand_from profile;'
+set -l keyboard_options '__fish_contains_opt -s k kbd-bright;'
+set -l graphics_options '__fish_seen_subcommand_from graphics;'
+
+set -l fan_modes 'silent normal boost'
+set -l brightness_modes 'off low med high'
+set -l led_modes 'static breathe strobe rainbow comet'
+set -l graphics_modes 'nvidia hybird compute integrated'
+
+
+complete -c $progname -e
+complete -c $progname -f
+
+# asusctl completion
+complete -c $progname -s h -f -l help -n "$noopt" -d "print help message"
+complete -c $progname -s v -f -l version -n "$noopt" -d "show program version number"
+complete -c $progname -s s -f -l show-supported -n "$noopt" -d "show supported functions of this laptop"
+complete -c $progname -s k -f -l kbd-bright -n "$noopt" -d "set led brightness"
+complete -c $progname -s f -f -l fan-mode -n "$noopt" -d "set fan mode independent of profile"
+complete -c $progname -s c -f -l chg-limit -n "$noopt" -d "set charge limit <20-100>"
+complete -c $progname -f -a "led-mode" -n "$noopt" -d "Set the keyboard lighting from built-in modes"
+complete -c $progname -f -a "profile" -n "$noopt" -d "Create and configure profiles"
+complete -c $progname -f -a "graphics" -n "$noopt" -d "Set the graphics mode"
+
+# brightness completion
+complete -c $progname -n "$keyboard_options" -d "available brightness modes" -a "$brightness_modes"
+
+# fan completion
+complete -c $progname -n "$fan_options" -d "available fan modes" -a $fan_modes
+
+# graphics completion
+set -l gopt 'not __fish_contains_opt -s h -s g -s m -s p help mode get pow;'
+
+complete -c $progname -n "$graphics_options and $gopt" -a "-h" -d "print help message"
+complete -c $progname -n "$graphics_options and $gopt" -a "-g" -d "Get the current mode"
+
+complete -c $progname -s h -f -l help -n "$graphics_options and $gopt" -d "print help message"
+complete -c $progname -s m -f -l mode -n "$graphics_options and $gopt" -d "Set graphics mode: <nvidia, hybrid, compute, integrated>"
+complete -c $progname -s g -f -l get -n "$graphics_options and $gopt" -d "Get the current mode"
+complete -c $progname -s p -f -l pow -n "$graphics_options and $gopt" -d "Get the current power status"
+
+complete -c $progname -n "$graphics_options and $gmod_options" -d "available graphics modes" -a "$graphics_modes"
+
+# led-mode completion
+complete -c $progname -n "$led_options" -a "-h" -d "print help message"
+complete -c $progname -n "$led_options" -a "-n" -d "switch to next aura mode"
+
+complete -c $progname -s h -f -l help -n "$led_options" -d "print help message"
+complete -c $progname -s n -f -l next-mode -n "$led_options" -d "switch to nex aura mode"
+complete -c $progname -s p -f -l prev-mode -n "$led_options" -d "switch to previous aura mode"
+complete -c $progname -n "$led_options" -d "available led modes" -a "$led_modes"
+
+# profile completion
+set -l popt 'not __fish_contains_opt -s h -s n -s c -s t -s m -s M -s f help next create turbo min-percentage max-percentage fan-preset;'
+
+complete -c $progname -n "$profile_options and $popt" -a "-h" -d "print help message"
+complete -c $progname -n "$profile_options and $popt" -a "-n" -d "toggle to next profile in list"
+
+complete -c $progname -s h -f -l help -n "$profile_options and $popt" -d "print help message"
+complete -c $progname -s n -f -l next -n "$profile_options and $popt" -d "toggle to next profile in list"
+complete -c $progname -s c -f -l create -n "$profile_options and $popt" -d "create the profile if it doesn't exist"
+complete -c $progname -s t -f -l turbo -n "$profile_options and $popt" -d "enable or disable cpu turbo"
+complete -c $progname -s m -f -l min-percentage -n "$profile_options and $popt" -d "set min cpu scaling (intel)"
+complete -c $progname -s M -f -l max-percentage -n "$profile_options and $popt" -d "set max cpu scaling (intel)"
+complete -c $progname -s f -f -l fan-preset -n "$profile_options and $popt" -d "<silent, normal, boost>"
+complete -c $progname -n "$profile_option and __fish_contains_opt fan-preset" -d "available fan modes" -a $fan_modes
+
--- a/rog-dbus/Cargo.toml
+++ b/rog-dbus/Cargo.toml
@@ -15,4 +15,4 @@ rog_types = { path = "../rog-types" }
 rog_fan_curve = { version = "^0.1", features = ["serde"] }
 zbus = "^1.8"
 zbus_macros = "^1.8"
-zvariant = "^2.4"
+zvariant = "^2.5"
--- a/rog-types/src/aura_modes.rs
+++ b/rog-types/src/aura_modes.rs
@@ -204,28 +204,28 @@ pub enum AuraModes {

 impl From<SetAuraBuiltin> for AuraModes {
    fn from(mode: SetAuraBuiltin) -> Self {
-        match mode {
-            SetAuraBuiltin::Static(x) => AuraModes::Static(x),
-            SetAuraBuiltin::Breathe(x) => AuraModes::Breathe(x),
-            SetAuraBuiltin::Strobe(x) => AuraModes::Strobe(x),
-            SetAuraBuiltin::Rainbow(x) => AuraModes::Rainbow(x),
-            SetAuraBuiltin::Star(x) => AuraModes::Star(x),
-            SetAuraBuiltin::Rain(x) => AuraModes::Rain(x),
-            SetAuraBuiltin::Highlight(x) => AuraModes::Highlight(x),
-            SetAuraBuiltin::Laser(x) => AuraModes::Laser(x),
-            SetAuraBuiltin::Ripple(x) => AuraModes::Ripple(x),
-            SetAuraBuiltin::Pulse(x) => AuraModes::Pulse(x),
-            SetAuraBuiltin::Comet(x) => AuraModes::Comet(x),
-            SetAuraBuiltin::Flash(x) => AuraModes::Flash(x),
-            SetAuraBuiltin::MultiStatic(x) => AuraModes::MultiStatic(x),
-            SetAuraBuiltin::MultiBreathe(x) => AuraModes::MultiBreathe(x),
-        }
+        (&mode).into()
    }
 }

 impl From<&SetAuraBuiltin> for AuraModes {
    fn from(mode: &SetAuraBuiltin) -> Self {
-        mode.clone().into()
+        match mode {
+            SetAuraBuiltin::Static(x) => AuraModes::Static(x.clone()),
+            SetAuraBuiltin::Breathe(x) => AuraModes::Breathe(x.clone()),
+            SetAuraBuiltin::Strobe(x) => AuraModes::Strobe(x.clone()),
+            SetAuraBuiltin::Rainbow(x) => AuraModes::Rainbow(x.clone()),
+            SetAuraBuiltin::Star(x) => AuraModes::Star(x.clone()),
+            SetAuraBuiltin::Rain(x) => AuraModes::Rain(x.clone()),
+            SetAuraBuiltin::Highlight(x) => AuraModes::Highlight(x.clone()),
+            SetAuraBuiltin::Laser(x) => AuraModes::Laser(x.clone()),
+            SetAuraBuiltin::Ripple(x) => AuraModes::Ripple(x.clone()),
+            SetAuraBuiltin::Pulse(x) => AuraModes::Pulse(x.clone()),
+            SetAuraBuiltin::Comet(x) => AuraModes::Comet(x.clone()),
+            SetAuraBuiltin::Flash(x) => AuraModes::Flash(x.clone()),
+            SetAuraBuiltin::MultiStatic(x) => AuraModes::MultiStatic(x.clone()),
+            SetAuraBuiltin::MultiBreathe(x) => AuraModes::MultiBreathe(x.clone()),
+        }
    }
 }

--- a/rog-types/src/profile.rs
+++ b/rog-types/src/profile.rs
@@ -90,7 +90,11 @@ pub struct ProfileCommand {

    #[options(meta = "", help = "<silent, normal, boost>")]
    pub fan_preset: Option<FanLevel>,
-    #[options(meta = "", parse(try_from_str = "parse_fan_curve"), help = "set fan curve")]
+    #[options(
+        meta = "",
+        parse(try_from_str = "parse_fan_curve"),
+        help = "set fan curve"
+    )]
    pub curve: Option<Curve>,
    #[options(free)]
    pub profile: Option<String>,
Author	SHA1	Message	Date
Luke Jones	c29afaf751	Merge branch 'fluke/optimising' into 'main' Fluke/optimising See merge request asus-linux/asus-nb-ctrl!34	2021-03-16 08:12:01 +00:00
Luke D Jones	cec4016862	Refactored gfx switch session monitor	2021-03-16 21:09:17 +13:00
Luke Jones	c697d94a00	Merge branch 'main' into 'main' added fish completion See merge request asus-linux/asus-nb-ctrl!32	2021-03-14 08:30:39 +00:00
Luke D Jones	35438e2e77	Move logind-zbus to own crate and publish	2021-03-13 22:07:31 +13:00
alenpaul2001	716b524d70	updated Makefile	2021-03-13 01:01:22 +05:30
alenpaul2001	cffd5672b2	added fish completion	2021-03-13 00:40:46 +05:30
Luke D Jones	82bb032336	Bump crate deps	2021-03-12 22:09:40 +13:00
Luke D Jones	ae4f7f9949	Buildup of logind dbus methods	2021-03-12 22:00:31 +13:00
Luke D Jones	875ff6d354	Begin implementing logind dbus crate	2021-03-12 16:55:52 +13:00
Luke D Jones	842fa48fac	Refresh sessions list every 3rd active check	2021-03-12 15:04:37 +13:00
Luke D Jones	8a63dce85f	Bugfix: destroy the deref clone stackoverflow	2021-03-11 23:42:38 +13:00
Luke Jones	01386599f4	Merge branch 'fluke/hotfixing' into 'main' Graphics switching now waits for user sessions to end See merge request asus-linux/asus-nb-ctrl!31	2021-03-11 08:17:41 +00:00
Luke D Jones	4310b4b742	Graphics switching now waits for user sessions to end	2021-03-11 21:13:41 +13:00
Luke D Jones	89f4dd6ec4	Prep release	2021-03-11 12:32:34 +13:00
Luke Jones	85e0b79fb9	Merge branch 'fluke/testing-gfx-switch' into 'main' More verbose and thorough checks for gfx switching See merge request asus-linux/asus-nb-ctrl!30	2021-03-10 23:28:02 +00:00
Luke D Jones	fba5f26f7e	More verbose and thorough checks for gfx switching - Small fixes - Cleanup bios help - g-sync warnings on toggling	2021-03-11 12:24:01 +13:00