Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a3b4f98 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915: shorten debugfs output simple attributes 



commit 647416f9
Author: Kees Cook <keescook@chromium.org>
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 <keescook@chromium.org>
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 87476d63

drivers/gpu/drm/i915/i915_debugfs.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -901,7 +901,7 @@ i915_next_seqno_set(void *data, u64 val) 




DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops,

DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops,

			i915_next_seqno_get, i915_next_seqno_set,

			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)

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,

DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops,

			i915_wedged_get, i915_wedged_set,

			i915_wedged_get, i915_wedged_set,

			"wedged :  %llu\n");

			"%llu\n");





static int

static int

i915_ring_stop_get(void *data, u64 *val)

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,

DEFINE_SIMPLE_ATTRIBUTE(i915_max_freq_fops,

			i915_max_freq_get, i915_max_freq_set,

			i915_max_freq_get, i915_max_freq_set,

			"max freq: %llu\n");

			"%llu\n");





static int

static int

i915_min_freq_get(void *data, u64 *val)

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,

DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops,

			i915_min_freq_get, i915_min_freq_set,

			i915_min_freq_get, i915_min_freq_set,

			"min freq: %llu\n");

			"%llu\n");





static int

static int

i915_cache_sharing_get(void *data, u64 *val)

i915_cache_sharing_get(void *data, u64 *val)