1 files changed, 36 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index da74522f377d..0785ddbb3d46 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -99,6 +99,42 @@
 static int do_switch(struct intel_ring_buffer *ring,
                      struct i915_hw_context *to);
 
+static void ppgtt_release(struct kref *kref)
+{
+        struct i915_hw_ppgtt *ppgtt = container_of(kref, struct i915_hw_ppgtt, ref);
+        struct drm_device *dev = ppgtt->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct i915_address_space *vm = &ppgtt->base;
+
+        if (ppgtt == dev_priv->mm.aliasing_ppgtt ||
+            (list_empty(&vm->active_list) && list_empty(&vm->inactive_list))) {
+                ppgtt->base.cleanup(&ppgtt->base);
+                return;
+        }
+
+        /*
+         * Make sure vmas are unbound before we take down the drm_mm
+         *
+         * FIXME: Proper refcounting should take care of this, this shouldn't be
+         * needed at all.
+         */
+        if (!list_empty(&vm->active_list)) {
+                struct i915_vma *vma;
+
+                list_for_each_entry(vma, &vm->active_list, mm_list)
+                        if (WARN_ON(list_empty(&vma->vma_link) ||
+                                    list_is_singular(&vma->vma_link)))
+                                break;
+
+                i915_gem_evict_vm(&ppgtt->base, true);
+        } else {
+                i915_gem_retire_requests(dev);
+                i915_gem_evict_vm(&ppgtt->base, false);
+        }
+
+        ppgtt->base.cleanup(&ppgtt->base);
+}
+
 static size_t get_context_alignment(struct drm_device *dev)
 {
         if (IS_GEN6(dev))