diff options
| author | Eric Anholt <eric@anholt.net> | 2008-12-01 10:23:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-12-01 10:23:21 +1000 |
| commit | 151903d5466fbcfb56ce792c3d5ea0ecbae15d07 (patch) | |
| tree | 35b0ecc9fa8cbd40ba6995a58cdda9f4b8d6ab0b /drivers/gpu | |
| parent | 9bd062d9eaf9e790330f37d9f4518e1b95131f6c (diff) | |
| download | op-kernel-dev-151903d5466fbcfb56ce792c3d5ea0ecbae15d07.zip op-kernel-dev-151903d5466fbcfb56ce792c3d5ea0ecbae15d07.tar.gz | |
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 54bb0d0..d58ddef 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; |
