Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_gem_debug.c

diff --git a/drivers/gpu/drm/i915/i915_gem_debug.c b/drivers/gpu/drm/i915/i915_gem_debug.c
index 35507cf53fa3c2e3e24c6a145a2882b021bcf1e0..80f380b1d951fe8875260b90849cbf78ced35d5a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_debug.c
+++ b/drivers/gpu/drm/i915/i915_gem_debug.c
@@ -39,7 +39,7 @@ i915_verify_inactive(struct drm_device *dev, char *file, int line)
        struct drm_i915_gem_object *obj_priv;
 
        list_for_each_entry(obj_priv, &dev_priv->mm.inactive_list, list) {
-               obj = obj_priv->obj;
+               obj = &obj_priv->base;
                if (obj_priv->pin_count || obj_priv->active ||
                    (obj->write_domain & ~(I915_GEM_DOMAIN_CPU |
                                           I915_GEM_DOMAIN_GTT)))