diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 1de974a..cf0cd73 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -161,7 +161,7 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) if (pm_state.event == PM_EVENT_PRETHAW) return 0; - + NV_INFO(dev, "Disabling fbcon acceleration...\n"); fbdev_flags = dev_priv->fbdev_info->flags; dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED; @@ -224,18 +224,29 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) NV_INFO(dev, "And we're gone!\n"); pci_save_state(pdev); + NV_INFO(dev, "And we're gone 2!\n"); if (pm_state.event == PM_EVENT_SUSPEND) { - pci_disable_device(pdev); - pci_set_power_state(pdev, PCI_D3hot); + NV_INFO(dev, "And we're gone 3!\n"); + + pci_disable_device(pdev); + NV_INFO(dev, "And we're gone 4!\n"); + // pci_set_power_state(pdev, PCI_D3hot); + NV_INFO(dev, "And we're gone 5!\n"); } - acquire_console_sem(); + // NV_INFO(dev, "And we're gone 6!\n"); + // acquire_console_sem(); + // NV_INFO(dev, "And we're gone 7!\n"); fb_set_suspend(dev_priv->fbdev_info, 1); - release_console_sem(); + // NV_INFO(dev, "And we're gone 8!\n"); + // release_console_sem(); + // NV_INFO(dev, "And we're gone 9!\n"); dev_priv->fbdev_info->flags = fbdev_flags; + NV_INFO(dev, "And we're REALLY gone!\n"); return 0; out_abort: + // release_console_sem(); //DEBUG NV_INFO(dev, "Re-enabling acceleration..\n"); pfifo->enable(dev); pfifo->reassign(dev, true);