aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-30 16:45:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-30 16:45:13 -0800
commitd9d060a98ff89fe0f86e24c9c0c3d2f0c566781c (patch)
tree8f56e9131504d738725cf040a30131456608901e
parent03cfdb86ac66677dbe76accae3f22c374a15b814 (diff)
parent151903d5466fbcfb56ce792c3d5ea0ecbae15d07 (diff)
downloadmrst-s0i3-test-d9d060a98ff89fe0f86e24c9c0c3d2f0c566781c.tar.gz
mrst-s0i3-test-d9d060a98ff89fe0f86e24c9c0c3d2f0c566781c.tar.xz
mrst-s0i3-test-d9d060a98ff89fe0f86e24c9c0c3d2f0c566781c.zip
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.
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 54bb0d0e49b..d58ddef468f 100644
--- 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;