drm/i915: Do aliasing PPGTT init with contexts

We have a default context which suits the aliasing PPGTT well. Tie them
together so it looks like any other context/PPGTT pair. This makes the
code cleaner as it won't have to special case aliasing as often.

The patch has one slightly tricky part in the default context creation
function. In the future (and on aliased setup) we create a new VM for a
context (potentially). However, if we have aliasing PPGTT, which occurs
at this point in time for all platforms GEN6+, we can simply manage the
refcounting to allow things to behave as normal. Now is a good time to
recall that the aliasing_ppgtt doesn't have a real VM, it uses the GGTT
drm_mm.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 1 insertions, 12 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index cc1ac797fba5..427596b8d66a 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4404,7 +4404,6 @@ int
 i915_gem_init_hw(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
-        struct i915_hw_ppgtt *ppgtt;
         int ret, i;
 
         if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt())
@@ -4446,16 +4445,6 @@ i915_gem_init_hw(struct drm_device *dev)
                 goto err_out;
         }
 
-        if (dev_priv->mm.aliasing_ppgtt) {
-                ppgtt = dev_priv->mm.aliasing_ppgtt;
-                ret = ppgtt->enable(ppgtt);
-                if (ret) {
-                        i915_gem_cleanup_aliasing_ppgtt(dev);
-                        DRM_INFO("PPGTT enable failed. This is not fatal, but unexpected\n");
-                        ret = 0;
-                }
-        }
-
         return 0;
 
 err_out:
@@ -4486,8 +4475,8 @@ int i915_gem_init(struct drm_device *dev)
         ret = i915_gem_init_hw(dev);
         mutex_unlock(&dev->struct_mutex);
         if (ret) {
+                WARN_ON(dev_priv->mm.aliasing_ppgtt);
                 i915_gem_context_fini(dev);
-                i915_gem_cleanup_aliasing_ppgtt(dev);
                 drm_mm_takedown(&dev_priv->gtt.base.mm);
                 return ret;
         }