Commit 18d4dbd8 authored by Dave Airlie's avatar Dave Airlie

Revert "drm/nv50-/gpio: initialise to vbios defaults during init"

This reverts commit 991083ba.

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: default avatarDave Airlie <airlied@redhat.com>
parent 8d4f5cc8
...@@ -115,9 +115,6 @@ nv50_gpio_init(struct drm_device *dev) ...@@ -115,9 +115,6 @@ nv50_gpio_init(struct drm_device *dev)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; 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 */ /* disable, and ack any pending gpio interrupts */
nv_wr32(dev, 0xe050, 0x00000000); nv_wr32(dev, 0xe050, 0x00000000);
nv_wr32(dev, 0xe054, 0xffffffff); nv_wr32(dev, 0xe054, 0xffffffff);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment