diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-01 13:42:29 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-01 13:44:41 +0000 |
| commit | f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca (patch) | |
| tree | 5c9f6950c1e8dc9190ab923c3c374db132fa1631 /drivers/gpu/drm/i915/i915_gem_evict.c | |
| parent | 0f8c6d7ca9257d6a01671ab69b897860d3ae9bc0 (diff) | |
| parent | c6afd658073f9fdb4cc80664dac71fa9db6fdf35 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_evict.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_evict.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index a2609c5542f..3f6f336bbb4 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c @@ -179,9 +179,7 @@ i915_gem_evict_everything(struct drm_device *dev, bool purgeable_only) lists_empty = (list_empty(&dev_priv->mm.inactive_list) && list_empty(&dev_priv->mm.flushing_list) && - list_empty(&dev_priv->render_ring.active_list) && - list_empty(&dev_priv->bsd_ring.active_list) && - list_empty(&dev_priv->blt_ring.active_list)); + list_empty(&dev_priv->mm.active_list)); if (lists_empty) return -ENOSPC; |