diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-03-12 13:35:38 +1100 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-03-12 13:35:38 +1100 |
| commit | 0abc1dfc02203d21c078edd8ac73e89e4abd7a5e (patch) | |
| tree | fe93dafce697ef68cccb13a3d1faa25ef8c793d3 | |
| parent | 0326d830647be8b557f028da8f73fe457d701719 (diff) | |
move i915_gem_idle closer to 3.8.2
| -rw-r--r-- | sys/dev/pci/drm/i915_gem.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/pci/drm/i915_gem.c b/sys/dev/pci/drm/i915_gem.c index 332c8cae129..62a6e1bdda9 100644 --- a/sys/dev/pci/drm/i915_gem.c +++ b/sys/dev/pci/drm/i915_gem.c @@ -2820,15 +2820,11 @@ i915_gem_idle(struct inteldrm_softc *dev_priv) DRM_UNLOCK(); return (ret); } + i915_gem_retire_requests(dev_priv); /* Under UMS, be paranoid and evict. */ - if (!drm_core_check_feature(dev, DRIVER_MODESET)) { - ret = i915_gem_evict_inactive(dev_priv); - if (ret) { - DRM_UNLOCK(); - return (ret); - } - } + if (!drm_core_check_feature(dev, DRIVER_MODESET)) + i915_gem_evict_everything(dev_priv); i915_gem_reset_fences(dev); |