Suspend/resume shouldn't call drm_initial_config (seems to work ok for me now),

also we should fail if we can't enable the device at resume time.
This commit is contained in:
Jesse Barnes 2007-05-24 18:41:44 -07:00
parent 462d5a0dfc
commit fa92e1f2ec

View file

@ -172,7 +172,8 @@ static int i915_resume(struct pci_dev *pdev)
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
pci_enable_device(pdev);
if (pci_enable_device(pdev))
return -1;
/* Disable outputs */
list_for_each_entry(output, &dev->mode_config.output_list, head)
@ -294,8 +295,6 @@ static int i915_resume(struct pci_dev *pdev)
vgaHWLock(hwp);
#endif
drm_initial_config(dev, 0);
return 0;
}