Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218127
b: refs/heads/master
c: 8f2480f
h: refs/heads/master
i:
  218125: 07b6d48
  218123: eb316b1
  218119: 1fc3168
  218111: 66d32e6
v: v3
  • Loading branch information
Chris Wilson committed Sep 30, 2010
1 parent c3d5afe commit 5894825
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 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: d21d5975686fbc107f9352006b06e1e92b4c5810
refs/heads/master: 8f2480fb05991f1a5522dd48332cd9db4f7745c6
11 changes: 9 additions & 2 deletions trunk/drivers/gpu/drm/i915/i915_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data)
struct drm_device *dev = node->minor->dev;
drm_i915_private_t *dev_priv = dev->dev_private;
struct drm_i915_gem_object *obj_priv;
int ret;
size_t total_obj_size, total_gtt_size;
int count, ret;

ret = mutex_lock_interruptible(&dev->struct_mutex);
if (ret)
Expand Down Expand Up @@ -171,13 +172,19 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data)
return -EINVAL;
}

total_obj_size = total_gtt_size = count = 0;
list_for_each_entry(obj_priv, head, list) {
seq_printf(m, " ");
describe_obj(m, obj_priv);
seq_printf(m, "\n");
total_obj_size += obj_priv->base.size;
total_gtt_size += obj_priv->gtt_space->size;
count++;
}

mutex_unlock(&dev->struct_mutex);

seq_printf(m, "Total %d objects, %zu bytes, %zu GTT size\n",
count, total_obj_size, total_gtt_size);
return 0;
}

Expand Down

0 comments on commit 5894825

Please sign in to comment.