| Message ID | 1463063296-7722-1-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On to, 2016-05-12 at 15:28 +0100, Chris Wilson wrote: > Currently for handling the extra hibernation phases we just call the > equivalent suspend/resume phases. In the next couple of patches, I wish > to specialise the hibernation phases to reduce the amount of work > required for handling GEM objects. > > v2: There are more! Don't forget the freeze phases. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Imre Deak <imre.deak@intel.com> > Cc: David Weinehall <david.weinehall@intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_drv.c | 45 +++++++++++++++++++++++++++++++++++------ > 1 file changed, 39 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 5ae79601335c..6a2e7f84276b 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1115,6 +1115,39 @@ static int i915_pm_resume(struct device *dev) > return i915_drm_resume(drm_dev); > } > > +/* freeze: before creating the hibernation_image */ > +static int i915_pm_freeze(struct device *dev) > +{ > + return i915_pm_suspend(dev); > +} > + > +static int i915_pm_freeze_late(struct device *dev) > +{ > + return i915_pm_suspend_late(dev); > +} > + > +/* thaw: called after creating the hibernation image, but before turning off. */ > +static int i915_pm_thaw_early(struct device *dev) > +{ > + return i915_pm_resume_early(dev); > +} > + > +static int i915_pm_thaw(struct device *dev) > +{ > + return i915_pm_resume(dev); > +} > + > +/* restore: called after loading the hibernation image. */ > +static int i915_pm_restore_early(struct device *dev) > +{ > + return i915_pm_resume_early(dev); > +} > + > +static int i915_pm_restore(struct device *dev) > +{ > + return i915_pm_resume(dev); > +} > + > /* > * Save all Gunit registers that may be lost after a D3 and a subsequent > * S0i[R123] transition. The list of registers needing a save/restore is > @@ -1669,14 +1702,14 @@ static const struct dev_pm_ops i915_pm_ops = { > * @restore, @restore_early : called after rebooting and restoring the > * hibernation image [PMSG_RESTORE] > */ > - .freeze = i915_pm_suspend, > - .freeze_late = i915_pm_suspend_late, > - .thaw_early = i915_pm_resume_early, > - .thaw = i915_pm_resume, > + .freeze = i915_pm_freeze, > + .freeze_late = i915_pm_freeze_late, > + .thaw_early = i915_pm_thaw_early, > + .thaw = i915_pm_thaw, > .poweroff = i915_pm_suspend, > .poweroff_late = i915_pm_poweroff_late, > - .restore_early = i915_pm_resume_early, > - .restore = i915_pm_resume, > + .restore_early = i915_pm_restore_early, > + .restore = i915_pm_restore, > > /* S0ix (via runtime suspend) event handlers */ > .runtime_suspend = intel_runtime_suspend,
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 5ae79601335c..6a2e7f84276b 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1115,6 +1115,39 @@ static int i915_pm_resume(struct device *dev) return i915_drm_resume(drm_dev); } +/* freeze: before creating the hibernation_image */ +static int i915_pm_freeze(struct device *dev) +{ + return i915_pm_suspend(dev); +} + +static int i915_pm_freeze_late(struct device *dev) +{ + return i915_pm_suspend_late(dev); +} + +/* thaw: called after creating the hibernation image, but before turning off. */ +static int i915_pm_thaw_early(struct device *dev) +{ + return i915_pm_resume_early(dev); +} + +static int i915_pm_thaw(struct device *dev) +{ + return i915_pm_resume(dev); +} + +/* restore: called after loading the hibernation image. */ +static int i915_pm_restore_early(struct device *dev) +{ + return i915_pm_resume_early(dev); +} + +static int i915_pm_restore(struct device *dev) +{ + return i915_pm_resume(dev); +} + /* * Save all Gunit registers that may be lost after a D3 and a subsequent * S0i[R123] transition. The list of registers needing a save/restore is @@ -1669,14 +1702,14 @@ static const struct dev_pm_ops i915_pm_ops = { * @restore, @restore_early : called after rebooting and restoring the * hibernation image [PMSG_RESTORE] */ - .freeze = i915_pm_suspend, - .freeze_late = i915_pm_suspend_late, - .thaw_early = i915_pm_resume_early, - .thaw = i915_pm_resume, + .freeze = i915_pm_freeze, + .freeze_late = i915_pm_freeze_late, + .thaw_early = i915_pm_thaw_early, + .thaw = i915_pm_thaw, .poweroff = i915_pm_suspend, .poweroff_late = i915_pm_poweroff_late, - .restore_early = i915_pm_resume_early, - .restore = i915_pm_resume, + .restore_early = i915_pm_restore_early, + .restore = i915_pm_restore, /* S0ix (via runtime suspend) event handlers */ .runtime_suspend = intel_runtime_suspend,
Currently for handling the extra hibernation phases we just call the equivalent suspend/resume phases. In the next couple of patches, I wish to specialise the hibernation phases to reduce the amount of work required for handling GEM objects. v2: There are more! Don't forget the freeze phases. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Imre Deak <imre.deak@intel.com> Cc: David Weinehall <david.weinehall@intel.com> --- drivers/gpu/drm/i915/i915_drv.c | 45 +++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-)