nybble
/
system76-dkms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable mandatory integration with NV HDA driver

This commit is contained in:
Jesse D. McDonald 2020-07-16 23:16:42 -05:00 committed by Jesse McDonald
parent d3d9ce28c6
commit 82f289d6e7
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
system76-dkms (1.0.21-jdm1) jammy; urgency=medium
* Disable integration with the nv_hda driver
-- Jesse McDonald <jesse@jessemcdonald.info> Tue, 25 Nov 2025 00:25:19 -0600
system76-dkms (1.0.21) jammy; urgency=medium system76-dkms (1.0.21) jammy; urgency=medium
* Add oryp13 * Add oryp13

6
src/system76.c
View File

@ -91,7 +91,9 @@ static int s76_wmbb(u32 method_id, u32 arg, u32 *retval)
#include "input.c" #include "input.c"
#include "kb-led.c" #include "kb-led.c"
#include "hwmon.c" #include "hwmon.c"
#ifdef S76_WANTS_NV_HDA
#include "nv_hda.c" #include "nv_hda.c"
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
static void s76_wmi_notify(union acpi_object *obj, void *context) 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 #endif
#ifdef S76_WANTS_NV_HDA
err = nv_hda_init(&dev->dev); err = nv_hda_init(&dev->dev);
if (unlikely(err)) { if (unlikely(err)) {
pr_err("Could not register NVIDIA audio device\n"); pr_err("Could not register NVIDIA audio device\n");
} }
#endif
err = wmi_install_notify_handler(S76_EVENT_GUID, s76_wmi_notify, NULL); err = wmi_install_notify_handler(S76_EVENT_GUID, s76_wmi_notify, NULL);
if (unlikely(ACPI_FAILURE(err))) { if (unlikely(ACPI_FAILURE(err))) {
@ -228,7 +232,9 @@ static int s76_remove(struct platform_device *dev)
{ {
wmi_remove_notify_handler(S76_EVENT_GUID); wmi_remove_notify_handler(S76_EVENT_GUID);
#ifdef S76_WANTS_NV_HDA
nv_hda_exit(); nv_hda_exit();
#endif
#ifdef S76_HAS_HWMON #ifdef S76_HAS_HWMON
if (driver_flags & DRIVER_HWMON) { if (driver_flags & DRIVER_HWMON) {
s76_hwmon_fini(&dev->dev); s76_hwmon_fini(&dev->dev);