diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-09-20 07:00:15 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-09-20 07:00:15 -0400 |
| commit | 18d4dbd8866a34507d52495207ef5fcec6d41049 (patch) | |
| tree | d392879c2445100e1019fe18d7d6d0513caed7b7 /drivers/gpu | |
| parent | 8d4f5cc8816ee41c3277f35a91bee681636c6ff1 (diff) | |
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 <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_gpio.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c index f03490534893..f429e6a8ca7a 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) | |||
| 115 | { | 115 | { |
| 116 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 116 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
| 117 | 117 | ||
| 118 | /* initialise gpios and routing to vbios defaults */ | ||
| 119 | nouveau_gpio_reset(dev); | ||
| 120 | |||
| 121 | /* disable, and ack any pending gpio interrupts */ | 118 | /* disable, and ack any pending gpio interrupts */ |
| 122 | nv_wr32(dev, 0xe050, 0x00000000); | 119 | nv_wr32(dev, 0xe050, 0x00000000); |
| 123 | nv_wr32(dev, 0xe054, 0xffffffff); | 120 | nv_wr32(dev, 0xe054, 0xffffffff); |