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.
This commit is contained in:
Linus Torvalds 2008-11-30 16:45:13 -08:00
Родитель 03cfdb86ac 151903d546
Коммит d9d060a98f
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -2314,7 +2314,7 @@ i915_gem_idle(struct drm_device *dev)
while (!list_empty(&dev_priv->mm.flushing_list)) { while (!list_empty(&dev_priv->mm.flushing_list)) {
struct drm_i915_gem_object *obj_priv; 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, struct drm_i915_gem_object,
list); list);
obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS; obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS;