From 410137767d549a05dfa7e09bb70114ca376367eb Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 31 Aug 2012 10:51:20 +1000 Subject: [PATCH] --- yaml --- r: 322573 b: refs/heads/master c: 991083ba60f89e717e3a4175be96d48a810e9eae h: refs/heads/master i: 322571: 675a0feba10ac490200eee7124acaa8bd16529ad v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_gpio.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 05b74281a80d..8ca57e613a13 100644 --- 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 index f429e6a8ca7a..f03490534893 100644 --- 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);