---

yaml --- r: 322573 b: refs/heads/master c: 991083b h: refs/heads/master i: 322571: 675a0fe v: v3
git-mirror · Aug 31, 2012 · 4101377 · 4101377
1 parent 6f5b018
commit 4101377
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a348cd5fd85dbca7260ef865c5def85929932861
+refs/heads/master: 991083ba60f89e717e3a4175be96d48a810e9eae
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_gpio.c b/trunk/drivers/gpu/drm/nouveau/nv50_gpio.c
@@ -115,6 +115,9 @@ nv50_gpio_init(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 
+	/* initialise gpios and routing to vbios defaults */
+	nouveau_gpio_reset(dev);
+
 	/* disable, and ack any pending gpio interrupts */
 	nv_wr32(dev, 0xe050, 0x00000000);
 	nv_wr32(dev, 0xe054, 0xffffffff);