drm: move pci bus master enable into driver.

[mv-sheeva.git] / drivers / gpu / drm / nouveau / nouveau_state.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index f5e98910d17faf6b80bcd64f49d9c8909896b6a7..912839c2bc16fb67fc8408f2c412b162b71a2a57 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -525,6 +525,7 @@ static void nouveau_switcheroo_set_state(struct pci_dev *pdev,
                printk(KERN_ERR "VGA switcheroo: switched nouveau off\n");
                dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
                drm_kms_helper_poll_disable(dev);
+               nouveau_switcheroo_optimus_dsm();
                nouveau_pci_suspend(pdev, pmm);
                dev->switch_power_state = DRM_SWITCH_POWER_OFF;
        }
@@ -1001,6 +1002,8 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
        dev->dev_private = dev_priv;
        dev_priv->dev = dev;
 
+       pci_set_master(dev->pdev);
+
        dev_priv->flags = flags & NOUVEAU_FLAGS;
 
        NV_DEBUG(dev, "vendor: 0x%X device: 0x%X class: 0x%X\n",