From: Eric Anholt Date: Mon, 1 Dec 2008 00:23:21 +0000 (+1000) Subject: drm/i915: Fix copy'n'pasteo that broke VT switch if flushing was non-empty. X-Git-Tag: v2.6.28-rc7~36^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=151903d5466fbcfb56ce792c3d5ea0ecbae15d07;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Dave Airlie --- 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;