On Fri, 2014-03-07 at 20:12 -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> We're adding runtime suspend support to more platforms, so organize
> the code in a way that all a new platform needs to do is to add its
> own gen-specific functions. Also rename the i915_ functions to intel_
> to make it clear that it's the top level one, not something that just
> runs on i915 platforms.
> 
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_drv.c | 32 ++++++++++++++++++++++++--------
>  1 file changed, 24 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 74f7a91..f75d776 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -832,7 +832,23 @@ static int i915_pm_poweroff(struct device *dev)
>  	return i915_drm_freeze(drm_dev);
>  }
>  
> -static int i915_runtime_suspend(struct device *device)
> +static void hsw_runtime_suspend(struct drm_i915_private *dev_priv)
> +{
> +	struct drm_device *dev = dev_priv->dev;
> +
> +	if (HAS_PC8(dev))
> +		hsw_enable_pc8(dev_priv);
> +}
> +
> +static void hsw_runtime_resume(struct drm_i915_private *dev_priv)
> +{
> +	struct drm_device *dev = dev_priv->dev;
> +
> +	if (HAS_PC8(dev))
> +		hsw_disable_pc8(dev_priv);
> +}
> +
> +static int intel_runtime_suspend(struct device *device)
>  {
>  	struct pci_dev *pdev = to_pci_dev(device);
>  	struct drm_device *dev = pci_get_drvdata(pdev);
> @@ -843,8 +859,8 @@ static int i915_runtime_suspend(struct device *device)
>  
>  	DRM_DEBUG_KMS("Suspending device\n");
>  
> -	if (HAS_PC8(dev))
> -		hsw_enable_pc8(dev_priv);
> +	if (IS_HASWELL(dev))
> +		hsw_runtime_suspend(dev_priv);
>  
>  	i915_gem_release_all_mmaps(dev_priv);
>  
> @@ -864,7 +880,7 @@ static int i915_runtime_suspend(struct device *device)
>  	return 0;
>  }
>  
> -static int i915_runtime_resume(struct device *device)
> +static int intel_runtime_resume(struct device *device)
>  {
>  	struct pci_dev *pdev = to_pci_dev(device);
>  	struct drm_device *dev = pci_get_drvdata(pdev);
> @@ -877,8 +893,8 @@ static int i915_runtime_resume(struct device *device)
>  	intel_opregion_notify_adapter(dev, PCI_D0);
>  	dev_priv->pm.suspended = false;
>  
> -	if (HAS_PC8(dev))
> -		hsw_disable_pc8(dev_priv);
> +	if (IS_HASWELL(dev))
> +		hsw_runtime_resume(dev_priv);
>  
>  	DRM_DEBUG_KMS("Device resumed\n");
>  	return 0;
> @@ -891,8 +907,8 @@ static const struct dev_pm_ops i915_pm_ops = {
>  	.thaw = i915_pm_thaw,
>  	.poweroff = i915_pm_poweroff,
>  	.restore = i915_pm_resume,
> -	.runtime_suspend = i915_runtime_suspend,
> -	.runtime_resume = i915_runtime_resume,
> +	.runtime_suspend = intel_runtime_suspend,
> +	.runtime_resume = intel_runtime_resume,
>  };
>  
>  static const struct vm_operations_struct i915_gem_vm_ops = {