drm/i915: Create an init vm

Move all the similar address space (VM) initialization code to one
function. Until we have multiple VMs, there should only ever be 1 VM.
The aliasing ppgtt is a special case without it's own VM (since it
doesn't need it's own address space management).

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

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index f48f1c47697735ffafc3b5b22eeef7c661492652..ce098c3ccc00fa710b945d7f9e7759e5044b2a4b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1485,10 +1485,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 
        i915_dump_device_info(dev_priv);
 
-       INIT_LIST_HEAD(&dev_priv->vm_list);
-       INIT_LIST_HEAD(&dev_priv->gtt.base.global_link);
-       list_add(&dev_priv->gtt.base.global_link, &dev_priv->vm_list);
-
        if (i915_get_bridge_dev(dev)) {
                ret = -EIO;
                goto free_priv;

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 35d17fb1b89bf66d1ffa14c22aa8c5e3f0c3c9f7..4e8a6d4815fa093b8baf39d1248589128aaa567e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4340,6 +4340,16 @@ init_ring_lists(struct intel_ring_buffer *ring)
        INIT_LIST_HEAD(&ring->request_list);
 }
 
+static void i915_init_vm(struct drm_i915_private *dev_priv,
+                        struct i915_address_space *vm)
+{
+       vm->dev = dev_priv->dev;
+       INIT_LIST_HEAD(&vm->active_list);
+       INIT_LIST_HEAD(&vm->inactive_list);
+       INIT_LIST_HEAD(&vm->global_link);
+       list_add(&vm->global_link, &dev_priv->vm_list);
+}
+
 void
 i915_gem_load(struct drm_device *dev)
 {
@@ -4352,8 +4362,9 @@ i915_gem_load(struct drm_device *dev)
                                  SLAB_HWCACHE_ALIGN,
                                  NULL);
 
-       INIT_LIST_HEAD(&dev_priv->gtt.base.active_list);
-       INIT_LIST_HEAD(&dev_priv->gtt.base.inactive_list);
+       INIT_LIST_HEAD(&dev_priv->vm_list);
+       i915_init_vm(dev_priv, &dev_priv->gtt.base);
+
        INIT_LIST_HEAD(&dev_priv->mm.unbound_list);
        INIT_LIST_HEAD(&dev_priv->mm.bound_list);
        INIT_LIST_HEAD(&dev_priv->mm.fence_list);