diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-04 06:52:47 (GMT) |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-04 07:09:34 (GMT) |
| commit | df0e9a287da83f3fd17b47d5f0682f48c722aee7 (patch) | |
| tree | 4464dce5d93eaa351310d94a0a6ba236ae3c5256 /drivers/gpu/drm/i915/i915_gem_gtt.c | |
| parent | 50e046b6a0ac42fdab4d3708224da8a0ae4997df (diff) | |
| download | linux-df0e9a287da83f3fd17b47d5f0682f48c722aee7.tar.xz | |
Revert "drm/i915: Clean up associated VMAs on context destruction"
This reverts commit e9f24d5fb7cf3628b195b18ff3ac4e37937ceeae.
The patch was only a stop-gap measure that fixed half the problem - the
leak of the fbcon when restarting X. A complete solution required
releasing the VMA when the object itself was closed rather than rely on
file/process exit. The previous patches add the VMA tracking necessary
to do close them along with the object, context or file, and so the time
has come to remove the partial fix.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470293567-10811-28-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_gtt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index d42463c..685ca2a 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -3368,7 +3368,7 @@ void i915_vma_close(struct i915_vma *vma) list_del_init(&vma->obj_link); if (!i915_vma_is_active(vma) && !vma->pin_count) - WARN_ON(__i915_vma_unbind_no_wait(vma)); + WARN_ON(i915_vma_unbind(vma)); } static struct i915_vma * |