Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: Fix copy'n'pasteo that broke VT switch if flushing was non-empty.
mariux64 · Dec 1, 2008 · d9d060a · d9d060a
2 parents 03cfdb8 + 151903d
commit d9d060a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
@@ -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;