[Intel-gfx] [PATCH] drm/i915: Fix build without CONFIG_PM

[Damien Lespiau]

On Mon, Jun 15, 2015 at 12:52:28PM +0100, Chris Wilson wrote:
> drivers/gpu/drm/i915/i915_debugfs.c: In function ‘i915_runtime_pm_status’:
> drivers/gpu/drm/i915/i915_debugfs.c:2528:34: error: ‘struct dev_pm_info’ has no member named ‘usage_count’
>       atomic_read(&dev->dev->power.usage_count));
> 
> Regression from commit a6aaec8be22652a808d6e316d4a92e58cb75e986
> Author: Damien Lespiau <damien.lespiau at intel.com>
> Date:   Thu Jun 4 18:23:58 2015 +0100
> 
>     drm/i915: Add runtime PM's usage_count in i915_runtime_pm_status
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Damien Lespiau <damien.lespiau at intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Cc: Jani Nikula <jani.nikula at intel.com>

Eeek.

Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>

-- 
Damien

> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 8f9554a61019..bd7a5fbf3959 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2524,8 +2524,12 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)
>  	seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy));
>  	seq_printf(m, "IRQs disabled: %s\n",
>  		   yesno(!intel_irqs_enabled(dev_priv)));
> +#ifdef CONFIG_PM
>  	seq_printf(m, "Usage count: %d\n",
>  		   atomic_read(&dev->dev->power.usage_count));
> +#else
> +	seq_printf(m, "Device Power Management (CONFIG_PM) disabled\n");
> +#endif
>  
>  	return 0;
>  }
> -- 
> 2.1.4
>