shark/bbswitch-g14
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bbswitch: Don't continue on disabling the device on a failing ACPI call

Browse Source
This commit is contained in:
Lekensteyn 2011-12-12 18:21:56 +01:00
parent 644cb5ee73
commit f85fc2789e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bbswitch.c
View File

@ -81,16 +81,19 @@ static int acpi_optimus_dsm(acpi_handle handle, int func, char *args,
return 0; return 0;
} }
static void bbswitch_acpi_off(void) { static int bbswitch_acpi_off(void) {
char args[] = {1, 0, 0, 3}; char args[] = {1, 0, 0, 3};
u32 result = 0; u32 result = 0;
if (!acpi_optimus_dsm(dis_handle, 0x1A, args, &result)) { if (!acpi_optimus_dsm(dis_handle, 0x1A, args, &result)) {
printk(KERN_INFO "bbswitch: Result of _DSM call: %08X\n", result); printk(KERN_INFO "bbswitch: Result of _DSM call: %08X\n", result);
return 0;
} }
// failure
return 1;
} }
static void bbswitch_acpi_on(void) { static int bbswitch_acpi_on(void) {
return 0;
} }
// Returns 1 if the card is disabled, 0 if enabled // Returns 1 if the card is disabled, 0 if enabled
@ -112,13 +115,17 @@ static void bbswitch_off(void) {
// if it's still in use by a driver (i.e. nouveau or nvidia) // if it's still in use by a driver (i.e. nouveau or nvidia)
if (dis_dev->driver) { if (dis_dev->driver) {
printk(KERN_WARNING "bbswitch: device %s is in use by driver '%s', " printk(KERN_WARNING "bbswitch: device %s is in use by driver '%s', "
"refusing OFF", dev_name(&dis_dev->dev), dis_dev->driver->name); "refusing OFF\n", dev_name(&dis_dev->dev), dis_dev->driver->name);
return; return;
} }
printk(KERN_INFO "bbswitch: disabling discrete graphics\n"); printk(KERN_INFO "bbswitch: disabling discrete graphics\n");
bbswitch_acpi_off(); if (bbswitch_acpi_off()) {
printk(KERN_WARNING "bbswitch: ACPI call failed, the device is not"
" disabled\n");
return;
}
pci_save_state(dis_dev); pci_save_state(dis_dev);
pci_clear_master(dis_dev); pci_clear_master(dis_dev);