From 3a3b4f984b230d815d9f956f296a6145f1dfebb7 Mon Sep 17 00:00:00 2001 From: Mika Kuoppala Date: Fri, 12 Apr 2013 12:10:05 +0300 Subject: [PATCH] drm/i915: shorten debugfs output simple attributes commit 647416f9eefe7699754b01b9fc82758fde83248c Author: Kees Cook Date: Sun Mar 10 14:10:06 2013 -0700 drm/i915: use simple attribute in debugfs routines made i915_next_seqno debugfs entry to crop it's output if returned value was large enough. Using simple_attr will limit the output to 24 bytes. Fix is to strip out preamples on all simple attributes that have one. v2: Fix all simple attributes (Daniel Vetter) Cc: Kees Cook Signed-off-by: Mika Kuoppala Acked-by: Kees Cook Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 7da45aa..23187fc 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -901,7 +901,7 @@ i915_next_seqno_set(void *data, u64 val) DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops, i915_next_seqno_get, i915_next_seqno_set, - "next_seqno : 0x%llx\n"); + "0x%llx\n"); static int i915_rstdby_delays(struct seq_file *m, void *unused) { @@ -1690,7 +1690,7 @@ i915_wedged_set(void *data, u64 val) DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops, i915_wedged_get, i915_wedged_set, - "wedged : %llu\n"); + "%llu\n"); static int i915_ring_stop_get(void *data, u64 *val) @@ -1844,7 +1844,7 @@ i915_max_freq_set(void *data, u64 val) DEFINE_SIMPLE_ATTRIBUTE(i915_max_freq_fops, i915_max_freq_get, i915_max_freq_set, - "max freq: %llu\n"); + "%llu\n"); static int i915_min_freq_get(void *data, u64 *val) @@ -1895,7 +1895,7 @@ i915_min_freq_set(void *data, u64 val) DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops, i915_min_freq_get, i915_min_freq_set, - "min freq: %llu\n"); + "%llu\n"); static int i915_cache_sharing_get(void *data, u64 *val) -- 2.7.4