Skip to content

Commit

Permalink
drm/i915: disable/re-enable PCI device around S4 freeze/thaw
Browse files Browse the repository at this point in the history
We already disable everything during S4 freeze, except the PCI device
itself. There is no reason why we couldn't disable that too and doing
so allows us to unify these handlers in the next patch with the
corresponding S3 suspend/resume handlers.

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>
  • Loading branch information
Imre Deak authored and Daniel Vetter committed Oct 24, 2014
1 parent ee6f280 commit f2476ae
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/gpu/drm/i915/i915_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1019,12 +1019,11 @@ static int i915_pm_freeze_late(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct drm_device *drm_dev = pci_get_drvdata(pdev);
struct drm_i915_private *dev_priv = drm_dev->dev_private;

if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0;

return intel_suspend_complete(dev_priv);
return i915_drm_suspend_late(drm_dev);
}

static int i915_pm_thaw_early(struct device *dev)
Expand All @@ -1035,7 +1034,7 @@ static int i915_pm_thaw_early(struct device *dev)
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0;

return i915_drm_thaw_early(drm_dev);
return i915_resume_early(drm_dev);
}

static int i915_pm_thaw(struct device *dev)
Expand Down

0 comments on commit f2476ae

Please sign in to comment.