[Intel-gfx] [PATCH 20/23] drm/i915: kill struct i915_package_c8

[Jesse Barnes]

On Thu, 27 Feb 2014 19:26:47 -0300
Paulo Zanoni <przanoni at gmail.com> wrote:

> From: Paulo Zanoni <paulo.r.zanoni at intel.com>
> 
> The only remaining field of the struct was the lock, which was
> useless.
> 
> v2: - Rebase.
> 
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 2 --
>  drivers/gpu/drm/i915/i915_drv.h     | 6 ------
>  drivers/gpu/drm/i915/intel_pm.c     | 1 -
>  3 files changed, 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 213b093..ff81b90 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1996,11 +1996,9 @@ static int i915_pc8_status(struct seq_file *m, void *unused)
>  		return 0;
>  	}
>  
> -	mutex_lock(&dev_priv->pc8.lock);
>  	seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy));
>  	seq_printf(m, "IRQs disabled: %s\n",
>  		   yesno(dev_priv->pm.irqs_disabled));
> -	mutex_unlock(&dev_priv->pc8.lock);
>  
>  	return 0;
>  }
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 74fba1c..08b22e3 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1349,10 +1349,6 @@ struct ilk_wm_values {
>   *
>   * For more, read "Display Sequences for Package C8" on our documentation.
>   */
> -struct i915_package_c8 {
> -	struct mutex lock;
> -};
> -
>  struct i915_runtime_pm {
>  	bool suspended;
>  	bool irqs_disabled;
> @@ -1590,8 +1586,6 @@ typedef struct drm_i915_private {
>  		struct ilk_wm_values hw;
>  	} wm;
>  
> -	struct i915_package_c8 pc8;
> -
>  	struct i915_runtime_pm pm;
>  
>  	/* Old dri1 support infrastructure, beware the dragons ya fools entering
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 5ff4b59..3bd6e8f 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5769,7 +5769,6 @@ void intel_pm_setup(struct drm_device *dev)
>  
>  	mutex_init(&dev_priv->rps.hw_lock);
>  
> -	mutex_init(&dev_priv->pc8.lock);
>  	INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work,
>  			  intel_gen6_powersave_work);
>  

Yay, this is a nice simplification overall.

Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center