]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drm/i915: Fix copy'n'pasteo that broke VT switch if flushing was non-empty.
authorEric Anholt <eric@anholt.net>
Mon, 1 Dec 2008 00:23:21 +0000 (10:23 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 1 Dec 2008 00:23:21 +0000 (10:23 +1000)
Introduced in the "Avoid BUG_ONs on VT switch" commit.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/i915/i915_gem.c

index 54bb0d0e49b86fe6ed3ab69cb27f49570394679c..d58ddef468f8124c29f6af32412ee2ba31f9873e 100644 (file)
@@ -2314,7 +2314,7 @@ i915_gem_idle(struct drm_device *dev)
        while (!list_empty(&dev_priv->mm.flushing_list)) {
                struct drm_i915_gem_object *obj_priv;
 
-               obj_priv = list_first_entry(&dev_priv->mm.active_list,
+               obj_priv = list_first_entry(&dev_priv->mm.flushing_list,
                                            struct drm_i915_gem_object,
                                            list);
                obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS;