diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2013-05-31 14:28:48 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-03 04:51:14 -0400 |
commit | 35c20a60c7549b11fd1d8c5d5d7ab5b6b54d6ff9 (patch) | |
tree | 6a52e30213501afd3a4f4dede092decbbc4f8092 /drivers/gpu/drm/i915/i915_debugfs.c | |
parent | 401c29f607702864fd00b6154325f7570ebaba4f (diff) |
drm/i915: Rename the gtt_list to global_list
Since it will be used for the global bound/unbound list with full PPGTT,
this helps clarify things for upcoming code rework.
Recommended-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 76255a69752a..0e7e3c04d939 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -215,7 +215,7 @@ static int i915_gem_object_info(struct seq_file *m, void* data) | |||
215 | dev_priv->mm.object_memory); | 215 | dev_priv->mm.object_memory); |
216 | 216 | ||
217 | size = count = mappable_size = mappable_count = 0; | 217 | size = count = mappable_size = mappable_count = 0; |
218 | count_objects(&dev_priv->mm.bound_list, gtt_list); | 218 | count_objects(&dev_priv->mm.bound_list, global_list); |
219 | seq_printf(m, "%u [%u] objects, %zu [%zu] bytes in gtt\n", | 219 | seq_printf(m, "%u [%u] objects, %zu [%zu] bytes in gtt\n", |
220 | count, mappable_count, size, mappable_size); | 220 | count, mappable_count, size, mappable_size); |
221 | 221 | ||
@@ -230,7 +230,7 @@ static int i915_gem_object_info(struct seq_file *m, void* data) | |||
230 | count, mappable_count, size, mappable_size); | 230 | count, mappable_count, size, mappable_size); |
231 | 231 | ||
232 | size = count = purgeable_size = purgeable_count = 0; | 232 | size = count = purgeable_size = purgeable_count = 0; |
233 | list_for_each_entry(obj, &dev_priv->mm.unbound_list, gtt_list) { | 233 | list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list) { |
234 | size += obj->base.size, ++count; | 234 | size += obj->base.size, ++count; |
235 | if (obj->madv == I915_MADV_DONTNEED) | 235 | if (obj->madv == I915_MADV_DONTNEED) |
236 | purgeable_size += obj->base.size, ++purgeable_count; | 236 | purgeable_size += obj->base.size, ++purgeable_count; |
@@ -238,7 +238,7 @@ static int i915_gem_object_info(struct seq_file *m, void* data) | |||
238 | seq_printf(m, "%u unbound objects, %zu bytes\n", count, size); | 238 | seq_printf(m, "%u unbound objects, %zu bytes\n", count, size); |
239 | 239 | ||
240 | size = count = mappable_size = mappable_count = 0; | 240 | size = count = mappable_size = mappable_count = 0; |
241 | list_for_each_entry(obj, &dev_priv->mm.bound_list, gtt_list) { | 241 | list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) { |
242 | if (obj->fault_mappable) { | 242 | if (obj->fault_mappable) { |
243 | size += obj->gtt_space->size; | 243 | size += obj->gtt_space->size; |
244 | ++count; | 244 | ++count; |
@@ -283,7 +283,7 @@ static int i915_gem_gtt_info(struct seq_file *m, void* data) | |||
283 | return ret; | 283 | return ret; |
284 | 284 | ||
285 | total_obj_size = total_gtt_size = count = 0; | 285 | total_obj_size = total_gtt_size = count = 0; |
286 | list_for_each_entry(obj, &dev_priv->mm.bound_list, gtt_list) { | 286 | list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) { |
287 | if (list == PINNED_LIST && obj->pin_count == 0) | 287 | if (list == PINNED_LIST && obj->pin_count == 0) |
288 | continue; | 288 | continue; |
289 | 289 | ||
@@ -1944,7 +1944,8 @@ i915_drop_caches_set(void *data, u64 val) | |||
1944 | } | 1944 | } |
1945 | 1945 | ||
1946 | if (val & DROP_UNBOUND) { | 1946 | if (val & DROP_UNBOUND) { |
1947 | list_for_each_entry_safe(obj, next, &dev_priv->mm.unbound_list, gtt_list) | 1947 | list_for_each_entry_safe(obj, next, &dev_priv->mm.unbound_list, |
1948 | global_list) | ||
1948 | if (obj->pages_pin_count == 0) { | 1949 | if (obj->pages_pin_count == 0) { |
1949 | ret = i915_gem_object_put_pages(obj); | 1950 | ret = i915_gem_object_put_pages(obj); |
1950 | if (ret) | 1951 | if (ret) |