|
@@ -4793,6 +4793,9 @@ i915_gem_init_hw(struct drm_device *dev)
|
|
if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt())
|
|
if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt())
|
|
return -EIO;
|
|
return -EIO;
|
|
|
|
|
|
|
|
+ /* Double layer security blanket, see i915_gem_init() */
|
|
|
|
+ intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
|
|
|
|
+
|
|
if (dev_priv->ellc_size)
|
|
if (dev_priv->ellc_size)
|
|
I915_WRITE(HSW_IDICR, I915_READ(HSW_IDICR) | IDIHASHMSK(0xf));
|
|
I915_WRITE(HSW_IDICR, I915_READ(HSW_IDICR) | IDIHASHMSK(0xf));
|
|
|
|
|
|
@@ -4825,7 +4828,7 @@ i915_gem_init_hw(struct drm_device *dev)
|
|
for_each_ring(ring, dev_priv, i) {
|
|
for_each_ring(ring, dev_priv, i) {
|
|
ret = ring->init_hw(ring);
|
|
ret = ring->init_hw(ring);
|
|
if (ret)
|
|
if (ret)
|
|
- return ret;
|
|
|
|
|
|
+ goto out;
|
|
}
|
|
}
|
|
|
|
|
|
for (i = 0; i < NUM_L3_SLICES(dev); i++)
|
|
for (i = 0; i < NUM_L3_SLICES(dev); i++)
|
|
@@ -4842,9 +4845,11 @@ i915_gem_init_hw(struct drm_device *dev)
|
|
DRM_ERROR("Context enable failed %d\n", ret);
|
|
DRM_ERROR("Context enable failed %d\n", ret);
|
|
i915_gem_cleanup_ringbuffer(dev);
|
|
i915_gem_cleanup_ringbuffer(dev);
|
|
|
|
|
|
- return ret;
|
|
|
|
|
|
+ goto out;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+out:
|
|
|
|
+ intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -4878,6 +4883,14 @@ int i915_gem_init(struct drm_device *dev)
|
|
dev_priv->gt.stop_ring = intel_logical_ring_stop;
|
|
dev_priv->gt.stop_ring = intel_logical_ring_stop;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /* This is just a security blanket to placate dragons.
|
|
|
|
+ * On some systems, we very sporadically observe that the first TLBs
|
|
|
|
+ * used by the CS may be stale, despite us poking the TLB reset. If
|
|
|
|
+ * we hold the forcewake during initialisation these problems
|
|
|
|
+ * just magically go away.
|
|
|
|
+ */
|
|
|
|
+ intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
|
|
|
|
+
|
|
ret = i915_gem_init_userptr(dev);
|
|
ret = i915_gem_init_userptr(dev);
|
|
if (ret)
|
|
if (ret)
|
|
goto out_unlock;
|
|
goto out_unlock;
|
|
@@ -4904,6 +4917,7 @@ int i915_gem_init(struct drm_device *dev)
|
|
}
|
|
}
|
|
|
|
|
|
out_unlock:
|
|
out_unlock:
|
|
|
|
+ intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
|
|
mutex_unlock(&dev->struct_mutex);
|
|
mutex_unlock(&dev->struct_mutex);
|
|
|
|
|
|
return ret;
|
|
return ret;
|