From ec80dccc12262c7eb7f0b777a889c6cdbab4fd01 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 17 Feb 2009 23:53:41 -0800 Subject: [PATCH] --- yaml --- r: 138961 b: refs/heads/master c: 97d479e77b8621cc6e1cb06eabe5a73390c8149c h: refs/heads/master i: 138959: d193b744c03ffcd0de4ac79f8a26e426cf6d34ce v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_debugfs.c | 31 ++++++++++++------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index b2deaab71e42..dff179effa28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30106f97a6029f94a8f13a1ace877c850cf5cd37 +refs/heads/master: 97d479e77b8621cc6e1cb06eabe5a73390c8149c diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_debugfs.c b/trunk/drivers/gpu/drm/i915/i915_gem_debugfs.c index 4fc845cee804..f7e7d3750f8f 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_debugfs.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem_debugfs.c @@ -70,18 +70,27 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) list_for_each_entry(obj_priv, head, list) { + char *pin_description; struct drm_gem_object *obj = obj_priv->obj; - if (obj->name) { - seq_printf(m, " %p(%d): %08x %08x %d\n", - obj, obj->name, - obj->read_domains, obj->write_domain, - obj_priv->last_rendering_seqno); - } else { - seq_printf(m, " %p: %08x %08x %d\n", - obj, - obj->read_domains, obj->write_domain, - obj_priv->last_rendering_seqno); - } + + if (obj_priv->user_pin_count > 0) + pin_description = "P"; + else if (obj_priv->pin_count > 0) + pin_description = "p"; + else + pin_description = " "; + + seq_printf(m, " %p: %s %08x %08x %d", + obj, + pin_description, + obj->read_domains, obj->write_domain, + obj_priv->last_rendering_seqno); + + if (obj->name) + seq_printf(m, " (name: %d)", obj->name); + if (obj_priv->fence_reg != I915_FENCE_REG_NONE) + seq_printf(m, " (fence: %d\n", obj_priv->fence_reg); + seq_printf(m, "\n"); } return 0; }