Merge branch 'master' into hack-lenovo

Just in case this hack is needed in the future.

README.md

@@ -59,6 +59,45 @@ To uninstall it, run:
 
     # make -f Makefile.dkms uninstall
 
+Lenovo IdeaPad Y470/Y570 and Toshiba SATELLITE P870
+---------------------------------------------------
+[This kernel bug](https://bugzilla.kernel.org/show_bug.cgi?id=42696) is fixed in
+Linux 3.9-rc1 and Linux 3.8.5 which obsoletes this hack. Linux 3.7 is
+incompatible with this hack (and already EOL'd, so a backport fix won't be made
+available).
+
+In kernel version 3.6 and older, you need to apply an ugly hack on these laptops
+to make bbswitch and the
+driver (both nouveau and nvidia) work. For now I have decided not to put the
+hack in the bbswitch module since it is a very ugly hack that is comparable to
+writing a maximum allowable speed of 130 km/h on a traffic sign for a road
+where 120 km/h is allowed just because the radar gun does not work properly.
+
+The module has been tested on a Lenovo IdeaPad Y570 running an up-to-date
+version of Ubuntu 11.10 Oneiric (64-bit) with Bumblebee 3.0 (3.0-1~oneiricppa2)
+installed using the nvidia driver.
+
+To make use of it, use the `hack-lenovo` branch. An example using DKMS:
+
+    $ git clone git://github.com/Bumblebee-Project/bbswitch.git -b hack-lenovo
+    $ cd bbswitch
+    $ mkdir /usr/src/acpi-handle-hack-0.0.2
+    # cp Makefile acpi-handle-hack.c /usr/src/acpi-handle-hack-0.0.2
+    # cp dkms/acpi-handle-hack.conf /usr/src/acpi-handle-hack-0.0.2/dkms.conf
+    # dkms install -m acpi-handle-hack -v 0.0.2
+If everything goes well, you now need to get the hack loaded on boot. On
+Ubuntu and Debian, this can be done with:
+
+    echo acpi-handle-hack | sudo tee -a /etc/modules
+    sudo update-initramfs -u
+For other systems, adopt the instructions from the *Disable card on boot*
+section below. Please do not copy these instructions to blogs/forums/whatever
+without warning that the method is a hack (you can refer to the metaphore above)
+and that it may crash the machine if incorrectly applied. To apply these
+changes, you have to reboot (technically, unloading nvidia/nouveau, bbswitch and
+stopping bumblebeed, `modprobe acpi-handle-hack` and starting bumblebeed should
+work as well, but saying reboot is shorter)
+
 Usage
 -----
 

acpi-handle-hack.c

@@ -0,0 +1,134 @@
+/**
+ * Very ugly hack to work around a wrongly detected ACPI handle, see
+ * https://bugzilla.kernel.org/show_bug.cgi?id=42696
+ * https://bugzilla.kernel.org/show_bug.cgi?id=60829
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/acpi.h>
+#include <linux/dmi.h>
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Dirty ACPI handle hack for Lenovo IdeaPad Y[45]70");
+MODULE_AUTHOR("Peter Lekensteyn <lekensteyn@gmail.com>");
+MODULE_VERSION("0.0.2");
+
+static struct pci_dev *dis_dev;
+static acpi_handle orig_handle;
+
+/**
+ * Returns true if the system needs an ACPI handle hack
+ */
+static bool __init need_acpi_handle_hack(void) {
+	return dmi_match(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Y470             ")
+		|| dmi_match(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Y480")	
+		|| dmi_match(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Y570             ")
+		|| dmi_match(DMI_PRODUCT_VERSION, "LENOVO IDEAPAD Y570 ") /* sys-product-name: PIQY0 */
+		|| dmi_match(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Y580")
+		|| dmi_match(DMI_PRODUCT_VERSION, "Lenovo IdeaPad U510")
+		|| dmi_match(DMI_PRODUCT_VERSION, "PSPLBE-01V00HFR") /* TOSHIBA SATELLITE P870 */
+		|| dmi_match(DMI_PRODUCT_VERSION, "PSPLBA-02300S") /* TOSHIBA Satellite P870 */
+		|| dmi_match(DMI_PRODUCT_VERSION, "PSPLFE-00E009FR") /* TOSHIBA Satellite P870 */
+		|| dmi_match(DMI_PRODUCT_VERSION, "Lenovo G580")
+		|| dmi_match(DMI_PRODUCT_VERSION, "Lenovo G780")
+		|| dmi_match(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Z500")
+		|| (dmi_match(DMI_SYS_VENDOR, "LENOVO") && dmi_match(DMI_PRODUCT_NAME, "PIQY0")) /* Lenovo IdeaPad Y570 */
+		|| dmi_match(DMI_PRODUCT_NAME, "Aspire V5-573G")
+		|| dmi_match(DMI_PRODUCT_NAME, "Aspire V5-573PG")
+		;
+}
+
+static struct pci_dev __init *get_discrete_device(void) {
+	struct pci_dev *pdev = NULL;
+	while ((pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
+		int pci_class = pdev->class >> 8;
+
+		if (pci_class != PCI_CLASS_DISPLAY_VGA &&
+			pci_class != PCI_CLASS_DISPLAY_3D)
+			continue;
+
+		if (pdev->vendor != PCI_VENDOR_ID_INTEL) {
+			return pdev;
+		}
+	}
+	return NULL;
+}
+
+/**
+ * Very ugly hack to set the ACPI handle, do not use this as exemplary code!
+ */
+static void dev_set_acpi_handle(struct pci_dev *pdev, acpi_handle handle) {
+#ifdef ACPI_HANDLE_SET
+	ACPI_HANDLE_SET(&pdev->dev, handle);
+#else
+	/* for Linux 3.7 and earlier */
+	pdev->dev.archdata.acpi_handle = handle;
+#endif
+}
+
+static int __init hack_apply(void) {
+	acpi_handle tmp_handle, new_handle;
+	struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
+	if (!need_acpi_handle_hack()) {
+		pr_err("Machine does not need ACPI handle hack\n");
+		return -ENODEV;
+	}
+	dis_dev = get_discrete_device();
+	if (!dis_dev) {
+		pr_err("No discrete video card found\n");
+		return -ENODEV;
+	}
+
+#ifdef ACPI_HANDLE
+	/* since Linux 3.8 */
+	orig_handle = ACPI_HANDLE(&dis_dev->dev);
+#else
+	/* removed since Linux 3.13 */
+	orig_handle = DEVICE_ACPI_HANDLE(&dis_dev->dev);
+#endif
+	if (!orig_handle) {
+		pr_err("No ACPI handle found for discrete video card\n");
+		goto free_dev;
+	}
+	if (ACPI_FAILURE(acpi_get_name(orig_handle, ACPI_SINGLE_NAME, &buf))) {
+		pr_err("Could not acquire name for discrete video card\n");
+		goto free_dev;
+	}
+	if (strcmp((char *)buf.pointer, "PEGP") == 0) {
+		pr_err("Handle has already been changed to PEGP\n");
+		goto free_name;
+	}
+	/* \_SB.PCI0.PEG0.VGA_ -> \_SB.PCI0.PEG0.PEGP */
+	if (ACPI_FAILURE(acpi_get_parent(orig_handle, &tmp_handle))) {
+		pr_err("No parent device found for %s\n", (char *)buf.pointer);
+		goto free_name;
+	}
+	if (ACPI_FAILURE(acpi_get_handle(tmp_handle, "PEGP", &new_handle))) {
+		pr_err("No PEGP handle found on %s\n", (char *)buf.pointer);
+		goto free_name;
+	}
+	pr_info("Setting new ACPI handle for discrete video card\n");
+	dev_set_acpi_handle(dis_dev, new_handle);
+	kfree(buf.pointer);
+	pci_dev_put(dis_dev);
+	return 0;
+free_name:
+	kfree(buf.pointer);
+free_dev:
+	pci_dev_put(dis_dev);
+	return -ENODEV;
+}
+
+static void __exit hack_undo(void) {
+	if (orig_handle) {
+		pr_info("Restoring original ACPI handle for discrete"
+			" video card\n");
+		dev_set_acpi_handle(dis_dev, orig_handle);
+	}
+}
+
+module_init(hack_apply);
+module_exit(hack_undo);

bbswitch.c

@@ -35,13 +35,6 @@
 #include <linux/suspend.h>
 #include <linux/seq_file.h>
 #include <linux/pm_runtime.h>
-#include <linux/pm_domain.h>
-#include <linux/vga_switcheroo.h>
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
-#   define ACPI_HANDLE DEVICE_ACPI_HANDLE
-#endif
 
 #define BBSWITCH_VERSION "0.8"
 
@@ -93,15 +86,11 @@ http://lxr.linux.no/#linux+v3.1.5/drivers/gpu/drm/i915/intel_acpi.c
 #define DSM_TYPE_NVIDIA         2
 static int dsm_type = DSM_TYPE_UNSUPPORTED;
 
-/* The cached name of the discrete device (of the form "0000:01:00.0"). */
-static char dis_dev_name[16];
-/* dis_dev is non-NULL iff it is currently bound by bbswitch (and off). */
 static struct pci_dev *dis_dev;
 static acpi_handle dis_handle;
 
-/* The PM domain that wraps the PCI device, used to ensure that power is
+/* whether the card was off before suspend or not; on: 0, off: 1 */
- * available before the device is put in D0. ("Nvidia" DSM and PR3). */
+static int dis_before_suspend_disabled;
-static struct dev_pm_domain pm_domain;
 
 static char *buffer_to_string(const char *buffer, size_t n, char *target) {
     int i;
@@ -240,219 +229,82 @@ static int bbswitch_acpi_on(void) {
 
 // Returns 1 if the card is disabled, 0 if enabled
 static int is_card_disabled(void) {
-    /* Assume that the device is disabled when our PCI driver found a device. */
+    u32 cfg_word;
-    return dis_dev != NULL;
+    // read first config word which contains Vendor and Device ID. If all bits
+    // are enabled, the device is assumed to be off
+    pci_read_config_dword(dis_dev, 0, &cfg_word);
+    // if one of the bits is not enabled (the card is enabled), the inverted
+    // result will be non-zero and hence logical not will make it 0 ("false")
+    return !~cfg_word;
 }
 
+static void bbswitch_off(void) {
+    if (is_card_disabled())
+        return;
 
-/* Power source handling. */
+    // to prevent the system from possibly locking up, don't disable the device
-
+    // if it's still in use by a driver (i.e. nouveau or nvidia)
-static int bbswitch_pmd_runtime_suspend(struct device *dev)
+    if (dis_dev->driver) {
-{
+        pr_warn("device %s is in use by driver '%s', refusing OFF\n",
-    int ret;
+            dev_name(&dis_dev->dev), dis_dev->driver->name);
-
+        return;
-    pr_debug("Preparing for runtime suspend.\n");
+    }
-
-    /* Put the device in D3. */
-    ret = dev->bus->pm->runtime_suspend(dev);
-    if (ret)
-        return ret;
-
-    bbswitch_acpi_off();
-    /* TODO For PR3, disable them. */
-    return 0;
-}
-
-static int bbswitch_pmd_runtime_resume(struct device *dev)
-{
-    pr_info("enabling discrete graphics\n");
-
-    bbswitch_acpi_on();
-    /* TODO For PR3, enable them. */
-
-    /* Now ensure that the device is actually put in D0 by PCI. */
-    return dev->bus->pm->runtime_resume(dev);
-}
-
-static void bbswitch_pmd_set(struct device *dev)
-{
-    pm_domain.ops = *dev->bus->pm;
-    pm_domain.ops.runtime_resume = bbswitch_pmd_runtime_resume;
-    pm_domain.ops.runtime_suspend = bbswitch_pmd_runtime_suspend;
-    dev_pm_domain_set(dev, &pm_domain);
-}
-
-
-/* Nvidia device itself. */
-
-static int bbswitch_pci_runtime_suspend(struct device *dev)
-{
-    struct pci_dev *pdev = to_pci_dev(dev);
 
     pr_info("disabling discrete graphics\n");
 
-    /* Ensure that the audio driver knows not to touch us. */
+    if (bbswitch_optimus_dsm()) {
-    vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_OFF);
+        pr_warn("Optimus ACPI call failed, the device is not disabled\n");
-
-    bbswitch_optimus_dsm();
-
-    /* Save state now that the device is still awake, makes PCI layer happy */
-    pci_save_state(pdev);
-    /* TODO if _PR3 is supported, should this be PCI_D3hot? */
-    pci_set_power_state(pdev, PCI_D3hot);
-    return 0;
-}
-
-static int bbswitch_pci_runtime_resume(struct device *dev)
-{
-    struct pci_dev *pdev = to_pci_dev(dev);
-
-    pr_debug("Finishing runtime resume.\n");
-
-    /* Resume audio driver. */
-    vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_ON);
-    return 0;
-}
-
-static const struct dev_pm_ops bbswitch_pci_pm_ops = {
-    .runtime_suspend = bbswitch_pci_runtime_suspend,
-    .runtime_resume = bbswitch_pci_runtime_resume,
-    /* No runtime_idle callback, the default zero delay is sufficient. */
-};
-
-static int bbswitch_switcheroo_switchto(enum vga_switcheroo_client_id id)
-{
-    /* We do not support switching, only power on/off. */
-    return -ENOSYS;
-}
-
-static enum vga_switcheroo_client_id bbswitch_switcheroo_get_client_id(struct pci_dev *pdev)
-{
-    /* Our registered client is always the discrete GPU. */
-    return VGA_SWITCHEROO_DIS;
-}
-
-static const struct vga_switcheroo_handler bbswitch_handler = {
-    .switchto = bbswitch_switcheroo_switchto,
-    .get_client_id = bbswitch_switcheroo_get_client_id,
-};
-
-
-static void bbswitch_switcheroo_set_gpu_state(struct pci_dev *pdev, enum vga_switcheroo_state state)
-{
-    /* Nothing to do, we handle the PM domain ourselves. Perhaps we can add
-     * backwards compatibility with older kernels in this way and workaround
-     * bugs? */
-    pr_debug("set_gpu_state to %s\n", state == VGA_SWITCHEROO_ON ? "ON" : "OFF");
-}
-
-static bool bbswitch_switcheroo_can_switch(struct pci_dev *pdev)
-{
-    /* We do not support switching between IGD/DIS. */
-    return false;
-}
-
-static const struct vga_switcheroo_client_ops bbswitch_switcheroo_ops = {
-    .set_gpu_state = bbswitch_switcheroo_set_gpu_state,
-    .can_switch = bbswitch_switcheroo_can_switch,
-};
-
-static int bbswitch_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
-{
-    /* Only bind to the device which we discovered before. */
-    if (strcmp(dev_name(&pdev->dev), dis_dev_name))
-        return -ENODEV;
-
-    pr_debug("Found PCI device\n");
-    dis_dev = pdev;
-
-    bbswitch_pmd_set(&pdev->dev);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)
-    vga_switcheroo_register_handler(&bbswitch_handler, 0);
-#else
-    vga_switcheroo_register_handler(&bbswitch_handler);
-#endif
-    vga_switcheroo_register_client(pdev, &bbswitch_switcheroo_ops, true);
-
-    /* Prevent kernel from detaching the PCI device for some devices that
-     * generate hotplug events. The graphics card is typically not physically
-     * removable. */
-    pci_ignore_hotplug(pdev);
-
-    pm_runtime_set_active(&pdev->dev); /* clear any errors */
-    /* Use autosuspend to avoid lspci waking up the device multiple times. */
-    pm_runtime_set_autosuspend_delay(&pdev->dev, 2000);
-    pm_runtime_use_autosuspend(&pdev->dev);
-    pm_runtime_allow(&pdev->dev);
-    pm_runtime_put_autosuspend(&pdev->dev);
-    return 0;
-}
-
-static void bbswitch_pci_remove(struct pci_dev *pdev)
-{
-    pr_debug("Removing PCI device\n");
-
-    pm_runtime_get_noresume(&pdev->dev);
-    pm_runtime_dont_use_autosuspend(&pdev->dev);
-    pm_runtime_forbid(&pdev->dev);
-
-    vga_switcheroo_unregister_client(pdev);
-    vga_switcheroo_unregister_handler();
-    dev_pm_domain_set(&pdev->dev, NULL);
-
-    dis_dev = NULL;
-}
-
-static const struct pci_device_id pciidlist[] = {
-    { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
-      PCI_CLASS_DISPLAY_VGA << 8, 0xffff00 },
-    { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
-      PCI_CLASS_DISPLAY_3D << 8, 0xffff00 },
-    { 0, 0, 0 },
-};
-
-static struct pci_driver bbswitch_pci_driver = {
-    .name = KBUILD_MODNAME,
-    .id_table = pciidlist,
-    .probe  = bbswitch_pci_probe,
-    .remove = bbswitch_pci_remove,
-    .driver.pm = &bbswitch_pci_pm_ops,
-};
-
-
-static void bbswitch_off(void) {
-    int ret;
-
-    /* Do nothing if the device was disabled before. */
-    if (dis_dev)
-        return;
-
-    ret = pci_register_driver(&bbswitch_pci_driver);
-    if (ret) {
-        pr_warn("Cannot register PCI device\n");
         return;
     }
 
-    /* If the probe failed, remove the driver such that it can be reprobed on
+    pci_save_state(dis_dev);
-     * the next registration. */
+    pci_clear_master(dis_dev);
-    if (!dis_dev) {
+    pci_disable_device(dis_dev);
-#if 0
+    do {
-        /* TODO discover the other driver name if possible. */
+        struct acpi_device *ad = NULL;
-        pr_warn("device %s is in use by driver '%s', refusing OFF\n",
+        int r;
-            dev_name(&dis_dev->dev), dis_dev->driver->name);
-#endif
 
-        pr_warn("Could not bind to device, is it in use by an other driver?\n");
+        r = acpi_bus_get_device(dis_handle, &ad);
-        pci_unregister_driver(&bbswitch_pci_driver);
+        if (r || !ad) {
-    }
+            pr_warn("Cannot get ACPI device for PCI device\n");
+            break;
+        }
+        if (ad->power.state == ACPI_STATE_UNKNOWN) {
+            pr_debug("ACPI power state is unknown, forcing D0\n");
+            ad->power.state = ACPI_STATE_D0;
+        }
+    } while (0);
+    pci_set_power_state(dis_dev, PCI_D3cold);
+
+    if (bbswitch_acpi_off())
+        pr_warn("The discrete card could not be disabled by a _DSM call\n");
 }
 
 static void bbswitch_on(void) {
-    /* Do nothing if no device exists that was previously disabled. */
+    if (!is_card_disabled())
-    if (!dis_dev)
         return;
 
-    pci_unregister_driver(&bbswitch_pci_driver);
+    pr_info("enabling discrete graphics\n");
+
+    if (bbswitch_acpi_on())
+        pr_warn("The discrete card could not be enabled by a _DSM call\n");
+
+    pci_set_power_state(dis_dev, PCI_D0);
+    pci_restore_state(dis_dev);
+    if (pci_enable_device(dis_dev))
+        pr_warn("failed to enable %s\n", dev_name(&dis_dev->dev));
+    pci_set_master(dis_dev);
+}
+
+/* power bus so we can read PCI configuration space */
+static void dis_dev_get(void) {
+    if (dis_dev->bus && dis_dev->bus->self)
+        pm_runtime_get_sync(&dis_dev->bus->self->dev);
+}
+
+static void dis_dev_put(void) {
+    if (dis_dev->bus && dis_dev->bus->self)
+        pm_runtime_put_sync(&dis_dev->bus->self->dev);
 }
 
 static ssize_t bbswitch_proc_write(struct file *fp, const char __user *buff,
@@ -465,25 +317,64 @@ static ssize_t bbswitch_proc_write(struct file *fp, const char __user *buff,
     if (copy_from_user(cmd, buff, len))
         return -EFAULT;
 
+    dis_dev_get();
+
     if (strncmp(cmd, "OFF", 3) == 0)
         bbswitch_off();
 
     if (strncmp(cmd, "ON", 2) == 0)
         bbswitch_on();
 
+    dis_dev_put();
+
     return len;
 }
 
 static int bbswitch_proc_show(struct seq_file *seqfp, void *p) {
     // show the card state. Example output: 0000:01:00:00 ON
-    seq_printf(seqfp, "%s %s\n", dis_dev_name,
+    dis_dev_get();
+    seq_printf(seqfp, "%s %s\n", dev_name(&dis_dev->dev),
              is_card_disabled() ? "OFF" : "ON");
+    dis_dev_put();
     return 0;
 }
 static int bbswitch_proc_open(struct inode *inode, struct file *file) {
     return single_open(file, bbswitch_proc_show, NULL);
 }
 
+static int bbswitch_pm_handler(struct notifier_block *nbp,
+    unsigned long event_type, void *p) {
+    switch (event_type) {
+    case PM_HIBERNATION_PREPARE:
+    case PM_SUSPEND_PREPARE:
+        dis_dev_get();
+        dis_before_suspend_disabled = is_card_disabled();
+        // enable the device before suspend to avoid the PCI config space from
+        // being saved incorrectly
+        if (dis_before_suspend_disabled)
+            bbswitch_on();
+        dis_dev_put();
+        break;
+    case PM_POST_HIBERNATION:
+    case PM_POST_SUSPEND:
+    case PM_POST_RESTORE:
+        // after suspend, the card is on, but if it was off before suspend,
+        // disable it again
+        if (dis_before_suspend_disabled) {
+            dis_dev_get();
+            bbswitch_off();
+            dis_dev_put();
+        }
+        break;
+    case PM_RESTORE_PREPARE:
+        // deliberately don't do anything as it does not occur before suspend
+        // nor hibernate, but before restoring a saved image. In that case,
+        // either PM_POST_HIBERNATION or PM_POST_RESTORE will be called
+        break;
+    }
+    return 0;
+}
+
 static struct file_operations bbswitch_fops = {
     .open   = bbswitch_proc_open,
     .read   = seq_read,
@@ -492,6 +383,10 @@ static struct file_operations bbswitch_fops = {
     .release= single_release
 };
 
+static struct notifier_block nb = {
+    .notifier_call = &bbswitch_pm_handler
+};
+
 static int __init bbswitch_init(void) {
     struct proc_dir_entry *acpi_entry;
     struct pci_dev *pdev = NULL;
@@ -508,7 +403,13 @@ static int __init bbswitch_init(void) {
             pci_class != PCI_CLASS_DISPLAY_3D)
             continue;
 
+#ifdef ACPI_HANDLE
+        /* since Linux 3.8 */
         handle = ACPI_HANDLE(&pdev->dev);
+#else
+        /* removed since Linux 3.13 */
+        handle = DEVICE_ACPI_HANDLE(&pdev->dev);
+#endif
         if (!handle) {
             pr_warn("cannot find ACPI handle for VGA device %s\n",
                 dev_name(&pdev->dev));
@@ -522,7 +423,7 @@ static int __init bbswitch_init(void) {
             pr_info("Found integrated VGA device %s: %s\n",
                 dev_name(&pdev->dev), (char *)buf.pointer);
         } else {
-            strlcpy(dis_dev_name, dev_name(&pdev->dev), sizeof(dis_dev_name));
+            dis_dev = pdev;
             dis_handle = handle;
             pr_info("Found discrete VGA device %s: %s\n",
                 dev_name(&pdev->dev), (char *)buf.pointer);
@@ -530,7 +431,7 @@ static int __init bbswitch_init(void) {
         kfree(buf.pointer);
     }
 
-    if (dis_handle == NULL) {
+    if (dis_dev == NULL) {
         pr_err("No discrete VGA device found\n");
         return -ENODEV;
     }
@@ -562,11 +463,25 @@ static int __init bbswitch_init(void) {
         return -ENOMEM;
     }
 
-    if (load_state == CARD_OFF)
+    dis_dev_get();
+
+    if (!is_card_disabled()) {
+        /* We think the card is enabled, so ensure the kernel does as well */
+        if (pci_enable_device(dis_dev))
+            pr_warn("failed to enable %s\n", dev_name(&dis_dev->dev));
+    }
+
+    if (load_state == CARD_ON)
+        bbswitch_on();
+    else if (load_state == CARD_OFF)
         bbswitch_off();
 
     pr_info("Succesfully loaded. Discrete card %s is %s\n",
-        dis_dev_name, is_card_disabled() ? "off" : "on");
+        dev_name(&dis_dev->dev), is_card_disabled() ? "off" : "on");
+
+    dis_dev_put();
+
+    register_pm_notifier(&nb);
 
     return 0;
 }
@@ -574,8 +489,20 @@ static int __init bbswitch_init(void) {
 static void __exit bbswitch_exit(void) {
     remove_proc_entry("bbswitch", acpi_root_dir);
 
-    bbswitch_on();
+    dis_dev_get();
-    pr_info("Unloaded\n");
+
+    if (unload_state == CARD_ON)
+        bbswitch_on();
+    else if (unload_state == CARD_OFF)
+        bbswitch_off();
+
+    pr_info("Unloaded. Discrete card %s is %s\n",
+        dev_name(&dis_dev->dev), is_card_disabled() ? "off" : "on");
+
+    dis_dev_put();
+
+    if (nb.notifier_call)
+        unregister_pm_notifier(&nb);
 }
 
 module_init(bbswitch_init);

dkms/acpi-handle-hack.conf

@@ -0,0 +1,7 @@
+PACKAGE_NAME="acpi-handle-hack"
+PACKAGE_VERSION="0.0.2"
+MAKE[0]="make KVERSION=$kernelver modname=acpi-handle-hack"
+CLEAN="make clean"
+BUILT_MODULE_NAME[0]="acpi-handle-hack"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"
+AUTOINSTALL="yes"