aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Kuoppala <mika.kuoppala@linux.intel.com>2015-01-26 11:03:06 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-01-28 11:22:28 -0500
commit20e28fba48f21b6cf7ee53a5af5bac8bf506ecd8 (patch)
tree29d340662ac68ffebcb8b8453c6038bfd3d5e3d9
parentf654449a28e9cce283d6e3ef22c31fe7d865dff5 (diff)
drm/i915: Be consistent on printing seqnos
We have had %x and %u intermixed. Bring everything in line and use %x Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 214a8e56cc2b..3b332a493674 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -123,7 +123,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
123 struct i915_vma *vma; 123 struct i915_vma *vma;
124 int pin_count = 0; 124 int pin_count = 0;
125 125
126 seq_printf(m, "%pK: %s%s%s %8zdKiB %02x %02x %u %u %u%s%s%s", 126 seq_printf(m, "%pK: %s%s%s %8zdKiB %02x %02x %x %x %x%s%s%s",
127 &obj->base, 127 &obj->base,
128 get_pin_flag(obj), 128 get_pin_flag(obj),
129 get_tiling_flag(obj), 129 get_tiling_flag(obj),
@@ -569,7 +569,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
569 struct intel_engine_cs *ring = 569 struct intel_engine_cs *ring =
570 i915_gem_request_get_ring(work->flip_queued_req); 570 i915_gem_request_get_ring(work->flip_queued_req);
571 571
572 seq_printf(m, "Flip queued on %s at seqno %u, next seqno %u [current breadcrumb %u], completed? %d\n", 572 seq_printf(m, "Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n",
573 ring->name, 573 ring->name,
574 i915_gem_request_get_seqno(work->flip_queued_req), 574 i915_gem_request_get_seqno(work->flip_queued_req),
575 dev_priv->next_seqno, 575 dev_priv->next_seqno,
@@ -658,7 +658,7 @@ static int i915_gem_request_info(struct seq_file *m, void *data)
658 list_for_each_entry(gem_request, 658 list_for_each_entry(gem_request,
659 &ring->request_list, 659 &ring->request_list,
660 list) { 660 list) {
661 seq_printf(m, " %d @ %d\n", 661 seq_printf(m, " %x @ %d\n",
662 gem_request->seqno, 662 gem_request->seqno,
663 (int) (jiffies - gem_request->emitted_jiffies)); 663 (int) (jiffies - gem_request->emitted_jiffies));
664 } 664 }
@@ -676,7 +676,7 @@ static void i915_ring_seqno_info(struct seq_file *m,
676 struct intel_engine_cs *ring) 676 struct intel_engine_cs *ring)
677{ 677{
678 if (ring->get_seqno) { 678 if (ring->get_seqno) {
679 seq_printf(m, "Current sequence (%s): %u\n", 679 seq_printf(m, "Current sequence (%s): %x\n",
680 ring->name, ring->get_seqno(ring, false)); 680 ring->name, ring->get_seqno(ring, false));
681 } 681 }
682} 682}