From b05f680650f80591fde255ad4cc6f497d50d40a8 Mon Sep 17 00:00:00 2001
From: Luke D Jones <luke@ljones.dev>
Date: Wed, 10 Mar 2021 09:20:59 +1300
Subject: [PATCH] Test and create /etc/X11/xorg.conf.d/ if not exist

---
 CHANGELOG.md               |  6 ++++++
 daemon/src/ctrl_gfx/gfx.rs | 30 +++++++++++++++++-------------
 daemon/src/ctrl_gfx/mod.rs |  7 ++++++-
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f1aa0a9..f38ade97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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]
+### Changed
+- Test and create /etc/X11/xorg.conf.d/ if it doesn't exist
+
+# [3.1.0] - 2021-03-10
+### Changed
+- Add missing nvidia module nvidia_uvm to gfx ctrl list
 
 # [3.1.0] - 2021-03-09
 ### Added
diff --git a/daemon/src/ctrl_gfx/gfx.rs b/daemon/src/ctrl_gfx/gfx.rs
index 31f443a8..d7734c75 100644
--- a/daemon/src/ctrl_gfx/gfx.rs
+++ b/daemon/src/ctrl_gfx/gfx.rs
@@ -2,10 +2,10 @@ use ctrl_gfx::error::GfxError;
 use ctrl_gfx::*;
 use log::{error, info, warn};
 use rog_types::gfx_vendors::GfxVendors;
-use std::io::Write;
 use std::iter::FromIterator;
 use std::process::Command;
 use std::str::FromStr;
+use std::{io::Write, ops::Add, path::Path};
 use std::{sync::Arc, sync::Mutex};
 use sysfs_class::{PciDevice, SysClass};
 use system::{GraphicsDevice, PciBus};
@@ -210,13 +210,18 @@ impl CtrlGraphics {
             [PRIMARY_GPU_BEGIN, PRIMARY_GPU_END].concat()
         };
 
-        info!("Writing {}", PRIMARY_GPU_XORG_PATH);
+        if !Path::new(XORG_PATH).exists() {
+            std::fs::create_dir(XORG_PATH).map_err(|err| GfxError::Write(XORG_PATH.into(), err))?;
+        }
+
+        let file = XORG_PATH.to_string().add(XORG_FILE);
+        info!("Writing {}", file);
         let mut file = std::fs::OpenOptions::new()
             .create(true)
             .truncate(true)
             .write(true)
-            .open(PRIMARY_GPU_XORG_PATH)
-            .map_err(|err| GfxError::Write(PRIMARY_GPU_XORG_PATH.into(), err))?;
+            .open(&file)
+            .map_err(|err| GfxError::Write(file, err))?;
 
         file.write_all(&text)
             .and_then(|_| file.sync_all())
@@ -270,16 +275,18 @@ impl CtrlGraphics {
     }
 
     fn do_display_manager_action(action: &str) -> Result<(), RogError> {
-        let service = "display-manager.service";
         let mut cmd = Command::new("systemctl");
         cmd.arg(action);
-        cmd.arg(service);
+        cmd.arg(DISPLAY_MANAGER);
 
         let status = cmd
             .status()
             .map_err(|err| GfxError::Command(format!("{:?}", cmd), err))?;
         if !status.success() {
-            let msg = format!("systemctl {} {} failed: {:?}", action, service, status);
+            let msg = format!(
+                "systemctl {} {} failed: {:?}",
+                action, DISPLAY_MANAGER, status
+            );
             error!("{}", msg);
             return Err(GfxError::DisplayManager(msg).into());
         }
@@ -287,10 +294,9 @@ impl CtrlGraphics {
     }
 
     fn wait_display_manager_inactive() -> Result<(), RogError> {
-        let service = "display-manager.service";
         let mut cmd = Command::new("systemctl");
         cmd.arg("is-active");
-        cmd.arg(service);
+        cmd.arg(DISPLAY_MANAGER);
 
         let mut count = 0;
 
@@ -318,18 +324,16 @@ impl CtrlGraphics {
             .rescan()
             .map_err(|err| GfxError::Bus("bus rescan error".into(), err))?;
 
-        let drivers = vec!["nvidia_drm", "nvidia_uvm", "nvidia_modeset", "nvidia"]; // i2c_nvidia_gpu?
-
         match vendor {
             GfxVendors::Nvidia | GfxVendors::Hybrid | GfxVendors::Compute => {
-                for driver in drivers {
+                for driver in NVIDIA_DRIVERS.iter() {
                     Self::do_driver_action(driver, "modprobe")?;
                 }
             }
             // TODO: compute mode, needs different setup
             // GfxVendors::Compute => {}
             GfxVendors::Integrated => {
-                for driver in drivers {
+                for driver in NVIDIA_DRIVERS.iter() {
                     Self::do_driver_action(driver, "rmmod")?;
                 }
                 self.unbind_remove_nvidia()?;
diff --git a/daemon/src/ctrl_gfx/mod.rs b/daemon/src/ctrl_gfx/mod.rs
index ef4541b7..0966ed74 100644
--- a/daemon/src/ctrl_gfx/mod.rs
+++ b/daemon/src/ctrl_gfx/mod.rs
@@ -4,6 +4,10 @@ pub mod gfx;
 
 pub mod system;
 
+const NVIDIA_DRIVERS: [&str; 4] = ["nvidia_drm", "nvidia_uvm", "nvidia_modeset", "nvidia"];
+
+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
@@ -15,7 +19,8 @@ options nvidia NVreg_DynamicPowerManagement=0x02
 options nvidia-drm modeset=1
 "#;
 
-const PRIMARY_GPU_XORG_PATH: &str = "/etc/X11/xorg.conf.d/90-nvidia-primary.conf";
+const XORG_FILE: &str = "90-nvidia-primary.conf";
+const XORG_PATH: &str = "/etc/X11/xorg.conf.d/";
 
 static PRIMARY_GPU_BEGIN: &[u8] = br#"# Automatically generated by asusd
 Section "OutputClass"