diff options
| author | Imre Deak | 2014-10-23 18:23:27 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-10-24 16:34:21 +0200 |
| commit | fc49b3da0e1f20484ac069982e2dcbf1a53f60af (patch) | |
| tree | 6c6009d8471f530f57b5536ec843689d2cb57b04 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: add poweroff_late handler (diff) | |
| download | kernel-qcow2-linux-fc49b3da0e1f20484ac069982e2dcbf1a53f60af.tar.gz kernel-qcow2-linux-fc49b3da0e1f20484ac069982e2dcbf1a53f60af.tar.xz kernel-qcow2-linux-fc49b3da0e1f20484ac069982e2dcbf1a53f60af.zip | |
drm/i915: unify switcheroo and legacy suspend/resume handlers
By now we handle switcheroo and legacy suspend/resume the same way, so
no need to keep separate functions for them.
No functional change.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 1b398070b230..9a7353302b3f 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1275,12 +1275,12 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_ dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; /* i915 resume handler doesn't set to D0 */ pci_set_power_state(dev->pdev, PCI_D0); - i915_resume(dev); + i915_resume_legacy(dev); dev->switch_power_state = DRM_SWITCH_POWER_ON; } else { pr_err("switched off\n"); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; - i915_suspend(dev, pmm); + i915_suspend_legacy(dev, pmm); dev->switch_power_state = DRM_SWITCH_POWER_OFF; } } |