@@ -1231,28 +1231,30 @@ void i915_gem_init_swizzling(struct intel_uncore *uncore)
MISSING_CASE(INTEL_GEN(i915));
}
-static void init_unused_ring(struct drm_i915_private *dev_priv, u32 base)
+static void init_unused_ring(struct intel_uncore *uncore, u32 base)
{
- I915_WRITE(RING_CTL(base), 0);
- I915_WRITE(RING_HEAD(base), 0);
- I915_WRITE(RING_TAIL(base), 0);
- I915_WRITE(RING_START(base), 0);
+ intel_uncore_write(uncore, RING_CTL(base), 0);
+ intel_uncore_write(uncore, RING_HEAD(base), 0);
+ intel_uncore_write(uncore, RING_TAIL(base), 0);
+ intel_uncore_write(uncore, RING_START(base), 0);
}
-static void init_unused_rings(struct drm_i915_private *dev_priv)
+static void init_unused_rings(struct intel_uncore *uncore)
{
- if (IS_I830(dev_priv)) {
- init_unused_ring(dev_priv, PRB1_BASE);
- init_unused_ring(dev_priv, SRB0_BASE);
- init_unused_ring(dev_priv, SRB1_BASE);
- init_unused_ring(dev_priv, SRB2_BASE);
- init_unused_ring(dev_priv, SRB3_BASE);
- } else if (IS_GEN(dev_priv, 2)) {
- init_unused_ring(dev_priv, SRB0_BASE);
- init_unused_ring(dev_priv, SRB1_BASE);
- } else if (IS_GEN(dev_priv, 3)) {
- init_unused_ring(dev_priv, PRB1_BASE);
- init_unused_ring(dev_priv, PRB2_BASE);
+ struct drm_i915_private *i915 = uncore_to_i915(uncore);
+
+ if (IS_I830(i915)) {
+ init_unused_ring(uncore, PRB1_BASE);
+ init_unused_ring(uncore, SRB0_BASE);
+ init_unused_ring(uncore, SRB1_BASE);
+ init_unused_ring(uncore, SRB2_BASE);
+ init_unused_ring(uncore, SRB3_BASE);
+ } else if (IS_GEN(i915, 2)) {
+ init_unused_ring(uncore, SRB0_BASE);
+ init_unused_ring(uncore, SRB1_BASE);
+ } else if (IS_GEN(i915, 3)) {
+ init_unused_ring(uncore, PRB1_BASE);
+ init_unused_ring(uncore, PRB2_BASE);
}
}
@@ -1285,7 +1287,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)
* will prevent c3 entry. Makes sure all unused rings
* are totally idle.
*/
- init_unused_rings(dev_priv);
+ init_unused_rings(&dev_priv->uncore);
BUG_ON(!dev_priv->kernel_context);
ret = i915_terminally_wedged(dev_priv);