From: Dave Airlie Date: Thu, 20 Sep 2012 11:00:15 +0000 (+1000) Subject: Revert "drm/nv50-/gpio: initialise to vbios defaults during init" X-Git-Tag: v3.6-rc7~16^2~3 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=18d4dbd8866a34507d52495207ef5fcec6d41049;p=~emulex%2Finfiniband.git Revert "drm/nv50-/gpio: initialise to vbios defaults during init" This reverts commit 991083ba60f89e717e3a4175be96d48a810e9eae. We discovered this causes problem on some Dell eDP laptops, so Apple lose out for now, I might try and whip up a dmi based workaround for 3.6 but I'm not sure I'll get time. Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c index f0349053489..f429e6a8ca7 100644 --- a/drivers/gpu/drm/nouveau/nv50_gpio.c +++ b/drivers/gpu/drm/nouveau/nv50_gpio.c @@ -115,9 +115,6 @@ 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);