summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-05-24 18:41:44 -0700
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-05-24 18:41:44 -0700
commitfa92e1f2ec396d2e772734f726a0958801b9fc99 (patch)
tree6eb9e79a3a6442f6a808a63c42a5c82e4d63f551 /linux-core
parent462d5a0dfc80dfa02da3d24d30ad90ad0387f0a2 (diff)
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.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i915_drv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index ffdbab06..d58ca589 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -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;
}