Commit 5a17514e authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter

drm/i915: vlv: fix switcheroo/legacy suspend/resume

During switcheroo/legacy suspend we don't call the suspend_late handler
but when resuming afterwards we call resume_early. This happened to work
so far, since suspend_late only disabled the PCI device. This changed in

commit 016970be
Author: Sagar Kamble <sagar.a.kamble@intel.com>
Date:   Wed Aug 13 23:07:06 2014 +0530

    drm/i915: Sharing platform specific sequence between runtime and system susp

after which we also saved/restored the VLV Gunit HW state in
suspend_late/resume_early. So now since we don't save the state during
suspend a following resume will restore a corrupted state.

Fix this by calling the suspend_late handler during both switcheroo and
legacy suspend.

CC: Sagar Kamble <sagar.a.kamble@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarSagar Kamble <sagar.a.kamble@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 50a0072f
...@@ -670,11 +670,7 @@ int i915_suspend(struct drm_device *dev, pm_message_t state) ...@@ -670,11 +670,7 @@ int i915_suspend(struct drm_device *dev, pm_message_t state)
if (error) if (error)
return error; return error;
/* Shut down the device */ return i915_drm_suspend_late(dev);
pci_disable_device(dev->pdev);
pci_set_power_state(dev->pdev, PCI_D3hot);
return 0;
} }
static int i915_drm_thaw_early(struct drm_device *dev) static int i915_drm_thaw_early(struct drm_device *dev)
...@@ -790,7 +786,7 @@ static int i915_resume_early(struct drm_device *dev) ...@@ -790,7 +786,7 @@ static int i915_resume_early(struct drm_device *dev)
return i915_drm_thaw_early(dev); return i915_drm_thaw_early(dev);
} }
int i915_resume(struct drm_device *dev) static int i915_drm_resume(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
int ret; int ret;
...@@ -816,7 +812,12 @@ static int i915_resume_legacy(struct drm_device *dev) ...@@ -816,7 +812,12 @@ static int i915_resume_legacy(struct drm_device *dev)
if (ret) if (ret)
return ret; return ret;
return i915_resume(dev); return i915_drm_resume(dev);
}
int i915_resume(struct drm_device *dev)
{
return i915_resume_legacy(dev);
} }
/** /**
...@@ -1004,7 +1005,7 @@ static int i915_pm_resume(struct device *dev) ...@@ -1004,7 +1005,7 @@ static int i915_pm_resume(struct device *dev)
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct drm_device *drm_dev = pci_get_drvdata(pdev); struct drm_device *drm_dev = pci_get_drvdata(pdev);
return i915_resume(drm_dev); return i915_drm_resume(drm_dev);
} }
static int i915_pm_freeze(struct device *dev) static int i915_pm_freeze(struct device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment