---

yaml --- r: 138961 b: refs/heads/master c: 97d479e h: refs/heads/master i: 138959: d193b74 v: v3
git-mirror · Mar 13, 2009 · ec80dcc · ec80dcc
1 parent 5e5287c
commit ec80dcc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git 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
@@ -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;
 }