diff --git a/debian/changelog b/debian/changelog index 7c18f2f..d82ebca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +system76-dkms (1.0.21-jdm1) jammy; urgency=medium + + * Disable integration with the nv_hda driver + + -- Jesse McDonald Tue, 25 Nov 2025 00:25:19 -0600 + system76-dkms (1.0.21) jammy; urgency=medium * Add oryp13 diff --git a/src/system76.c b/src/system76.c index 0a80582..22cab2e 100644 --- a/src/system76.c +++ b/src/system76.c @@ -91,7 +91,9 @@ static int s76_wmbb(u32 method_id, u32 arg, u32 *retval) #include "input.c" #include "kb-led.c" #include "hwmon.c" +#ifdef S76_WANTS_NV_HDA #include "nv_hda.c" +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0) static void s76_wmi_notify(union acpi_object *obj, void *context) @@ -198,10 +200,12 @@ static int __init s76_probe(struct platform_device *dev) } #endif +#ifdef S76_WANTS_NV_HDA err = nv_hda_init(&dev->dev); if (unlikely(err)) { pr_err("Could not register NVIDIA audio device\n"); } +#endif err = wmi_install_notify_handler(S76_EVENT_GUID, s76_wmi_notify, NULL); if (unlikely(ACPI_FAILURE(err))) { @@ -228,7 +232,9 @@ static int s76_remove(struct platform_device *dev) { wmi_remove_notify_handler(S76_EVENT_GUID); + #ifdef S76_WANTS_NV_HDA nv_hda_exit(); + #endif #ifdef S76_HAS_HWMON if (driver_flags & DRIVER_HWMON) { s76_hwmon_fini(&dev->dev);