From fa92e1f2ec396d2e772734f726a0958801b9fc99 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 24 May 2007 18:41:44 -0700 Subject: 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. --- linux-core/i915_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'linux-core/i915_drv.c') 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; } -- cgit v1.2.3