Commit cbda12d7 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Eric Anholt

drm/i915: implement new pm ops for i915

One problem in i915 hibernate with current legacy pci pm ops is
that after we do freeze, we'll be forced to do resume once again,
which re-init some resources and do modesetting again, that is
unnecessary for hibernate. This patch trys to bypass that.

We can't resolve this within legacy pm framework, but can do it
easily with new pm ops. Suspend (S3) process has also been kept
without change.
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 11ba1592
...@@ -284,6 +284,52 @@ i915_pci_resume(struct pci_dev *pdev) ...@@ -284,6 +284,52 @@ i915_pci_resume(struct pci_dev *pdev)
return i915_resume(dev); return i915_resume(dev);
} }
static int
i915_pm_suspend(struct device *dev)
{
return i915_pci_suspend(to_pci_dev(dev), PMSG_SUSPEND);
}
static int
i915_pm_resume(struct device *dev)
{
return i915_pci_resume(to_pci_dev(dev));
}
static int
i915_pm_freeze(struct device *dev)
{
return i915_pci_suspend(to_pci_dev(dev), PMSG_FREEZE);
}
static int
i915_pm_thaw(struct device *dev)
{
/* thaw during hibernate, do nothing! */
return 0;
}
static int
i915_pm_poweroff(struct device *dev)
{
return i915_pci_suspend(to_pci_dev(dev), PMSG_HIBERNATE);
}
static int
i915_pm_restore(struct device *dev)
{
return i915_pci_resume(to_pci_dev(dev));
}
const struct dev_pm_ops i915_pm_ops = {
.suspend = i915_pm_suspend,
.resume = i915_pm_resume,
.freeze = i915_pm_freeze,
.thaw = i915_pm_thaw,
.poweroff = i915_pm_poweroff,
.restore = i915_pm_restore,
};
static struct vm_operations_struct i915_gem_vm_ops = { static struct vm_operations_struct i915_gem_vm_ops = {
.fault = i915_gem_fault, .fault = i915_gem_fault,
.open = drm_gem_vm_open, .open = drm_gem_vm_open,
...@@ -303,8 +349,6 @@ static struct drm_driver driver = { ...@@ -303,8 +349,6 @@ static struct drm_driver driver = {
.lastclose = i915_driver_lastclose, .lastclose = i915_driver_lastclose,
.preclose = i915_driver_preclose, .preclose = i915_driver_preclose,
.postclose = i915_driver_postclose, .postclose = i915_driver_postclose,
.suspend = i915_suspend,
.resume = i915_resume,
.device_is_agp = i915_driver_device_is_agp, .device_is_agp = i915_driver_device_is_agp,
.enable_vblank = i915_enable_vblank, .enable_vblank = i915_enable_vblank,
.disable_vblank = i915_disable_vblank, .disable_vblank = i915_disable_vblank,
...@@ -344,10 +388,7 @@ static struct drm_driver driver = { ...@@ -344,10 +388,7 @@ static struct drm_driver driver = {
.id_table = pciidlist, .id_table = pciidlist,
.probe = i915_pci_probe, .probe = i915_pci_probe,
.remove = i915_pci_remove, .remove = i915_pci_remove,
#ifdef CONFIG_PM .driver.pm = &i915_pm_ops,
.resume = i915_pci_resume,
.suspend = i915_pci_suspend,
#endif
}, },
.name = DRIVER_NAME, .name = DRIVER_NAME,
......
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