aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-07-02 10:51:02 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-03 16:08:46 -0400
commit990bbdadabaa51828e475eda86ee5720a4910cc3 (patch)
tree596748f31e6f00d21d59cd6c0cdcf9f08a28a219 /drivers/gpu/drm/i915/i915_dma.c
parent146937e5828ede495e11ba3a6f4a01b36b7166dc (diff)
drm/i915: Group the GT routines together in both code and vtable
Tidy up the routines for interacting with the GT (in particular the forcewake dance) which are scattered throughout the code in a single structure. v2: use wait_for_atomic for polling. v3: *really* use wait_for_atomic for polling. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Reviewed-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 216651917fd5..4dc76976c0d0 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1548,6 +1548,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
1548 } 1548 }
1549 1549
1550 intel_irq_init(dev); 1550 intel_irq_init(dev);
1551 intel_gt_init(dev);
1551 1552
1552 /* Try to make sure MCHBAR is enabled before poking at it */ 1553 /* Try to make sure MCHBAR is enabled before poking at it */
1553 intel_setup_mchbar(dev); 1554 intel_setup_mchbar(dev);
@@ -1580,7 +1581,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
1580 if (!IS_I945G(dev) && !IS_I945GM(dev)) 1581 if (!IS_I945G(dev) && !IS_I945GM(dev))
1581 pci_enable_msi(dev->pdev); 1582 pci_enable_msi(dev->pdev);
1582 1583
1583 spin_lock_init(&dev_priv->gt_lock);
1584 spin_lock_init(&dev_priv->irq_lock); 1584 spin_lock_init(&dev_priv->irq_lock);
1585 spin_lock_init(&dev_priv->error_lock); 1585 spin_lock_init(&dev_priv->error_lock);
1586 spin_lock_init(&dev_priv->rps_lock); 1586 spin_lock_init(&dev_priv->rps_lock);