diff options
author | Eric Anholt <eric@anholt.net> | 2008-11-30 19:23:21 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-11-30 19:23:21 -0500 |
commit | 151903d5466fbcfb56ce792c3d5ea0ecbae15d07 (patch) | |
tree | 35b0ecc9fa8cbd40ba6995a58cdda9f4b8d6ab0b /drivers/gpu | |
parent | 9bd062d9eaf9e790330f37d9f4518e1b95131f6c (diff) |
drm/i915: Fix copy'n'pasteo that broke VT switch if flushing was non-empty.
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
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 54bb0d0e49b8..d58ddef468f8 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) | |||
2314 | while (!list_empty(&dev_priv->mm.flushing_list)) { | 2314 | while (!list_empty(&dev_priv->mm.flushing_list)) { |
2315 | struct drm_i915_gem_object *obj_priv; | 2315 | struct drm_i915_gem_object *obj_priv; |
2316 | 2316 | ||
2317 | obj_priv = list_first_entry(&dev_priv->mm.active_list, | 2317 | obj_priv = list_first_entry(&dev_priv->mm.flushing_list, |
2318 | struct drm_i915_gem_object, | 2318 | struct drm_i915_gem_object, |
2319 | list); | 2319 | list); |
2320 | obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS; | 2320 | obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS; |