drm/i915: Only init engines once

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_gem.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0751ec9a96f1c42f40fc9bfb35552adb47b1194a..7a83a9fa76b32940de39a60e8f12f878c67220f2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4769,6 +4769,7 @@ int
 i915_gem_init_hw(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
+       struct intel_engine_cs *ring;
        int ret, i;
 
        if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt())
@@ -4795,9 +4796,11 @@ i915_gem_init_hw(struct drm_device *dev)
 
        i915_gem_init_swizzling(dev);
 
-       ret = dev_priv->gt.init_rings(dev);
-       if (ret)
-               return ret;
+       for_each_ring(ring, dev_priv, i) {
+               ret = ring->init_hw(ring);
+               if (ret)
+                       return ret;
+       }
 
        for (i = 0; i < NUM_L3_SLICES(dev); i++)
                i915_gem_l3_remap(&dev_priv->ring[RCS], i);
@@ -4870,6 +4873,10 @@ int i915_gem_init(struct drm_device *dev)
                return ret;
        }
 
+       ret = dev_priv->gt.init_rings(dev);
+       if (ret)
+               return ret;
+
        ret = i915_gem_init_hw(dev);
        if (ret == -EIO) {
                /* Allow ring initialisation to fail by marking the GPU as