[Intel-gfx] [PATCH 16/70] drm/i915: Suppress empty lines from debugfs/i915_gem_objects

[Daniel Vetter]

On Tue, Apr 07, 2015 at 04:20:40PM +0100, Chris Wilson wrote:
> This is just so that I don't have to read about the batch pool on
> systems that are not using it! Rather than using a newline between the
> kernel clients and userspace clients, just distinguish the internal
> allocations with a '[k]'
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index e87f031abc99..fbba5c267f5d 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -362,16 +362,18 @@ static int per_file_stats(int id, void *ptr, void *data)
>  	return 0;
>  }
>  
> -#define print_file_stats(m, name, stats) \
> -	seq_printf(m, "%s: %u objects, %zu bytes (%zu active, %zu inactive, %zu global, %zu shared, %zu unbound)\n", \
> -		   name, \
> -		   stats.count, \
> -		   stats.total, \
> -		   stats.active, \
> -		   stats.inactive, \
> -		   stats.global, \
> -		   stats.shared, \
> -		   stats.unbound)
> +#define print_file_stats(m, name, stats) do { \
> +	if (stats.count) \
> +		seq_printf(m, "%s: %u objects, %zu bytes (%zu active, %zu inactive, %zu global, %zu shared, %zu unbound)\n", \
> +			   name, \
> +			   stats.count, \
> +			   stats.total, \
> +			   stats.active, \
> +			   stats.inactive, \
> +			   stats.global, \
> +			   stats.shared, \
> +			   stats.unbound); \
> +} while (0)
>  
>  static void print_batch_pool_stats(struct seq_file *m,
>  				   struct drm_i915_private *dev_priv)
> @@ -392,7 +394,7 @@ static void print_batch_pool_stats(struct seq_file *m,
>  		}
>  	}
>  
> -	print_file_stats(m, "batch pool", stats);
> +	print_file_stats(m, "[k]batch pool", stats);
>  }
>  
>  #define count_vmas(list, member) do { \
> @@ -478,8 +480,6 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
>  
>  	seq_putc(m, '\n');
>  	print_batch_pool_stats(m, dev_priv);
> -
> -	seq_putc(m, '\n');
>  	list_for_each_entry_reverse(file, &dev->filelist, lhead) {
>  		struct file_stats stats;
>  		struct task_struct *task;
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch