diff options
| author | Dave Airlie | 2009-06-24 08:20:19 +0200 |
|---|---|---|
| committer | Dave Airlie | 2009-06-24 08:20:19 +0200 |
| commit | 5b6345be1b41db5e70f90c3559c3b40c8abcde8b (patch) | |
| tree | fb72ccb8fa82d88c2a0e1c1a0301cfe8a67a3e6e /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/radeon: fix driver initialization order so radeon kms can be builtin (diff) | |
| parent | drm/i915: initialize fence registers to zero when loading GEM (diff) | |
| download | kernel-qcow2-linux-5b6345be1b41db5e70f90c3559c3b40c8abcde8b.tar.gz kernel-qcow2-linux-5b6345be1b41db5e70f90c3559c3b40c8abcde8b.tar.xz kernel-qcow2-linux-5b6345be1b41db5e70f90c3559c3b40c8abcde8b.zip | |
Merge remote branch 'origin/drm-intel-next' of ../drm-intel into drm-fixes
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 98560e1e899a..e3cb4025e323 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -67,8 +67,6 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state) pci_save_state(dev->pdev); - i915_save_state(dev); - /* If KMS is active, we do the leavevt stuff here */ if (drm_core_check_feature(dev, DRIVER_MODESET)) { if (i915_gem_idle(dev)) @@ -77,6 +75,8 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state) drm_irq_uninstall(dev); } + i915_save_state(dev); + intel_opregion_free(dev, 1); if (state.event == PM_EVENT_SUSPEND) { |