[Intel-gfx] [PATCH 1/3] drm/i915: implement new pm ops for i915

[Zhenyu Wang]

On 2009.11.25 13:09:37 +0800, Zhenyu Wang wrote:
> 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.

Any comment or concern about this one?

This patch only changes for hibernate (S4), and removes screen flicking
(extra modesetting) during hibernate before power off machine. If any
other device failed in the hibernate process, the driver for it should be
fixed and worst case is a VT switch to bring back X.

> 
> Signed-off-by: Zhenyu Wang <zhenyuw at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c |   51 +++++++++++++++++++++++++++++++++++---
>  1 files changed, 47 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 2fa2178..0a20407 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -284,6 +284,52 @@ i915_pci_resume(struct pci_dev *pdev)
>  	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 = {
>  	.fault = i915_gem_fault,
>  	.open = drm_gem_vm_open,
> @@ -344,10 +390,7 @@ static struct drm_driver driver = {
>  		 .id_table = pciidlist,
>  		 .probe = i915_pci_probe,
>  		 .remove = i915_pci_remove,
> -#ifdef CONFIG_PM
> -		 .resume = i915_pci_resume,
> -		 .suspend = i915_pci_suspend,
> -#endif
> +		 .driver.pm = &i915_pm_ops,
>  	},
>  
>  	.name = DRIVER_NAME,
> -- 
> 1.6.3.3

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20091202/0346a691/attachment.sig>