---

yaml --- r: 322832 b: refs/heads/master c: 99d0b1d h: refs/heads/master v: v3
git-mirror · Sep 8, 2012 · 9325028 · 9325028
1 parent 2e16fe5
commit 9325028
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28dcc2d60cb570d9f549c329b2f51400553412a1
+refs/heads/master: 99d0b1db6ccd0c0e554398e8a579ff3dd4d119ee
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -1587,6 +1587,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	spin_lock_init(&dev_priv->irq_lock);
 	spin_lock_init(&dev_priv->error_lock);
 	spin_lock_init(&dev_priv->rps_lock);
+	spin_lock_init(&dev_priv->dpio_lock);
 
 	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
 		dev_priv->num_pipe = 3;