diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-04-09 15:05:09 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-04-19 23:23:14 -0400 |
commit | a8089e849a32c5b6bfd6c88dbd09c0ea4a779b71 (patch) | |
tree | 50eda22881d24af5668d87e3ee90669c2272082e /drivers/gpu/drm/i915/i915_debugfs.c | |
parent | 62b8b21515065235bd363ad07094d301532e14ce (diff) |
drm/i915: drop pointer to drm_gem_object
Luckily the change is quite a little bit less invasive than I've
feared.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index a0b8447b06e7..213aa3f67314 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -96,19 +96,18 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) | |||
96 | spin_lock(lock); | 96 | spin_lock(lock); |
97 | list_for_each_entry(obj_priv, head, list) | 97 | list_for_each_entry(obj_priv, head, list) |
98 | { | 98 | { |
99 | struct drm_gem_object *obj = obj_priv->obj; | ||
100 | |||
101 | seq_printf(m, " %p: %s %8zd %08x %08x %d%s%s", | 99 | seq_printf(m, " %p: %s %8zd %08x %08x %d%s%s", |
102 | obj, | 100 | &obj_priv->base, |
103 | get_pin_flag(obj_priv), | 101 | get_pin_flag(obj_priv), |
104 | obj->size, | 102 | obj_priv->base.size, |
105 | obj->read_domains, obj->write_domain, | 103 | obj_priv->base.read_domains, |
104 | obj_priv->base.write_domain, | ||
106 | obj_priv->last_rendering_seqno, | 105 | obj_priv->last_rendering_seqno, |
107 | obj_priv->dirty ? " dirty" : "", | 106 | obj_priv->dirty ? " dirty" : "", |
108 | obj_priv->madv == I915_MADV_DONTNEED ? " purgeable" : ""); | 107 | obj_priv->madv == I915_MADV_DONTNEED ? " purgeable" : ""); |
109 | 108 | ||
110 | if (obj->name) | 109 | if (obj_priv->base.name) |
111 | seq_printf(m, " (name: %d)", obj->name); | 110 | seq_printf(m, " (name: %d)", obj_priv->base.name); |
112 | if (obj_priv->fence_reg != I915_FENCE_REG_NONE) | 111 | if (obj_priv->fence_reg != I915_FENCE_REG_NONE) |
113 | seq_printf(m, " (fence: %d)", obj_priv->fence_reg); | 112 | seq_printf(m, " (fence: %d)", obj_priv->fence_reg); |
114 | if (obj_priv->gtt_space != NULL) | 113 | if (obj_priv->gtt_space != NULL) |
@@ -289,7 +288,7 @@ static int i915_batchbuffer_info(struct seq_file *m, void *data) | |||
289 | spin_lock(&dev_priv->mm.active_list_lock); | 288 | spin_lock(&dev_priv->mm.active_list_lock); |
290 | 289 | ||
291 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { | 290 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { |
292 | obj = obj_priv->obj; | 291 | obj = &obj_priv->base; |
293 | if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) { | 292 | if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) { |
294 | ret = i915_gem_object_get_pages(obj, 0); | 293 | ret = i915_gem_object_get_pages(obj, 0); |
295 | if (ret) { | 294 | if (ret) { |