Remove bonw15 nvidia quirk (handled by system76-driver)

Author: Drakulix

src/graphics.rs

@@ -4,18 +4,9 @@
 
 use crate::pci::PciBus;
 use serde::{Deserialize, Serialize};
-use std::{
-    fs,
-    io::{self, Write},
-    process::ExitStatus,
-};
+use std::{fs, io, process::ExitStatus};
 use sysfs_class::{PciDevice, SysClass};
 
-const MODPROBE_PATH: &str = "/etc/modprobe.d/system76-power.conf";
-static MODPROBE_NO_GC6: &[u8] = br"# Automatically generated by system76-power
-options nvidia NVreg_DynamicPowerManagement=0x01
-";
-
 const EXTERNAL_DISPLAY_REQUIRES_NVIDIA: &[&str] = &[
     "addw1",
     "addw2",
@@ -78,8 +69,8 @@ pub enum GraphicsDeviceError {
 }
 
 pub struct GraphicsDevice {
-    id: String,
-    devid: u16,
+    id:        String,
+    devid:     u16,
     functions: Vec<PciDevice>,
 }
 
@@ -90,14 +81,10 @@ impl GraphicsDevice {
     }
 
     #[must_use]
-    pub fn exists(&self) -> bool {
-        self.functions.iter().any(|func| func.path().exists())
-    }
+    pub fn exists(&self) -> bool { self.functions.iter().any(|func| func.path().exists()) }
 
     #[must_use]
-    pub const fn device(&self) -> u16 {
-        self.devid
-    }
+    pub const fn device(&self) -> u16 { self.devid }
 
     pub unsafe fn unbind(&self) -> Result<(), GraphicsDeviceError> {
         for func in &self.functions {
@@ -134,7 +121,7 @@ impl GraphicsDevice {
                     Ok(driver) => {
                         log::error!("{}: in use by {}", func.id(), driver.id());
                         return Err(GraphicsDeviceError::DeviceInUse {
-                            func: func.id().to_owned(),
+                            func:   func.id().to_owned(),
                             driver: driver.id().to_owned(),
                         });
                     }
@@ -166,12 +153,12 @@ impl GraphicsDevice {
 // supported-gpus.json
 #[derive(Serialize, Deserialize, Debug)]
 struct NvidiaDevice {
-    devid: String,
-    subdeviceid: Option<String>,
-    subvendorid: Option<String>,
-    name: String,
+    devid:        String,
+    subdeviceid:  Option<String>,
+    subvendorid:  Option<String>,
+    name:         String,
     legacybranch: Option<String>,
-    features: Vec<String>,
+    features:     Vec<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -180,11 +167,11 @@ struct SupportedGpus {
 }
 
 pub struct Graphics {
-    pub bus: PciBus,
-    pub amd: Vec<GraphicsDevice>,
-    pub intel: Vec<GraphicsDevice>,
+    pub bus:    PciBus,
+    pub amd:    Vec<GraphicsDevice>,
+    pub intel:  Vec<GraphicsDevice>,
     pub nvidia: Vec<GraphicsDevice>,
-    pub other: Vec<GraphicsDevice>,
+    pub other:  Vec<GraphicsDevice>,
 }
 
 impl Graphics {
@@ -255,29 +242,6 @@ impl Graphics {
             }
         }
 
-        let bonw15_hack = {
-            let dmi_vendor = fs::read_to_string("/sys/class/dmi/id/sys_vendor").unwrap_or_default();
-            let dmi_model =
-                fs::read_to_string("/sys/class/dmi/id/product_version").unwrap_or_default();
-            match (dmi_vendor.trim(), dmi_model.trim()) {
-                ("System76", "bonw15") => true,
-                ("System76", "bonw15-b") => true,
-                _ => false,
-            }
-        };
-
-        if bonw15_hack {
-            log::info!("Creating {}", MODPROBE_PATH);
-
-            let mut file = fs::OpenOptions::new()
-                .create(true)
-                .truncate(true)
-                .write(true)
-                .open(MODPROBE_PATH)?;
-
-            file.write_all(MODPROBE_NO_GC6).and_then(|()| file.sync_all())?;
-        }
-
         Ok(Self { bus, amd, intel, nvidia, other })
     }