Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 329343
b: refs/heads/master
c: b7abb71
h: refs/heads/master
i:
  329341: 4209196
  329339: 4a09f02
  329335: e6ffed6
  329327: 01d738e
  329311: 5e0a5fc
  329279: 5ca0ee2
  329215: 9dc43ba
v: v3
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Aug 21, 2012
1 parent f929ce4 commit 7a53f97
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c4670ad080a1fe60d49f850e11f64a41db525496
refs/heads/master: b7abb7144356536c41a81eda2bbfd46027e529f6
17 changes: 13 additions & 4 deletions trunk/drivers/gpu/drm/i915/i915_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
struct drm_info_node *node = (struct drm_info_node *) m->private;
struct drm_device *dev = node->minor->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
u32 count, mappable_count;
size_t size, mappable_size;
u32 count, mappable_count, purgeable_count;
size_t size, mappable_size, purgeable_size;
struct drm_i915_gem_object *obj;
int ret;

Expand All @@ -225,9 +225,12 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
seq_printf(m, " %u [%u] inactive objects, %zu [%zu] bytes\n",
count, mappable_count, size, mappable_size);

size = count = 0;
list_for_each_entry(obj, &dev_priv->mm.unbound_list, gtt_list)
size = count = purgeable_size = purgeable_count = 0;
list_for_each_entry(obj, &dev_priv->mm.unbound_list, gtt_list) {
size += obj->base.size, ++count;
if (obj->madv == I915_MADV_DONTNEED)
purgeable_size += obj->base.size, ++purgeable_count;
}
seq_printf(m, "%u unbound objects, %zu bytes\n", count, size);

size = count = mappable_size = mappable_count = 0;
Expand All @@ -240,7 +243,13 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
mappable_size += obj->gtt_space->size;
++mappable_count;
}
if (obj->madv == I915_MADV_DONTNEED) {
purgeable_size += obj->base.size;
++purgeable_count;
}
}
seq_printf(m, "%u purgeable objects, %zu bytes\n",
purgeable_count, purgeable_size);
seq_printf(m, "%u pinned mappable objects, %zu bytes\n",
mappable_count, mappable_size);
seq_printf(m, "%u fault mappable objects, %zu bytes\n",
Expand Down

0 comments on commit 7a53f97

Please sign in to comment.