diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-09-21 09:19:50 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-09-21 10:17:15 -0400 |
| commit | 6c06d608ec244d9b030f16ce9088b4456197e1cb (patch) | |
| tree | 756c786e7be5fa60d3d1dfeb8bf246e4e945c92b | |
| parent | 8e910d08a2fd61e3c0baf82042c6f0e0a9773df4 (diff) | |
| download | linux-3.10-6c06d608ec244d9b030f16ce9088b4456197e1cb.tar.gz linux-3.10-6c06d608ec244d9b030f16ce9088b4456197e1cb.tar.bz2 linux-3.10-6c06d608ec244d9b030f16ce9088b4456197e1cb.zip | |
drm/nouveau: add dmi quirk for gpio reset
This fixes the gpio reset problem so the Retina MBP works, but avoids
breaking the Dell systems. Ben will work on a better solution for 3.7.
Tested by me on retina MBP.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_gpio.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c index f429e6a8ca7..c399d510b27 100644 --- a/drivers/gpu/drm/nouveau/nv50_gpio.c +++ b/drivers/gpu/drm/nouveau/nv50_gpio.c @@ -22,6 +22,7 @@ * Authors: Ben Skeggs */ +#include <linux/dmi.h> #include "drmP.h" #include "nouveau_drv.h" #include "nouveau_hw.h" @@ -110,11 +111,26 @@ nv50_gpio_isr(struct drm_device *dev) nv_wr32(dev, 0xe074, intr1); } +static struct dmi_system_id gpio_reset_ids[] = { + { + .ident = "Apple Macbook 10,1", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro10,1"), + } + }, + { } +}; + int nv50_gpio_init(struct drm_device *dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; + /* initialise gpios and routing to vbios defaults */ + if (dmi_check_system(gpio_reset_ids)) + nouveau_gpio_reset(dev); + /* disable, and ack any pending gpio interrupts */ nv_wr32(dev, 0xe050, 0x00000000); nv_wr32(dev, 0xe054, 0xffffffff); |