summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Tacconi <tacconet@libero.it>2010-01-14 14:52:37 +0100
committerBen Skeggs <bskeggs@redhat.com>2010-01-15 09:28:02 +1000
commitb79d8a65d52d3d80204e1bad30ee57bb5a58ced1 (patch)
tree071cc6aaa24e1307ce066d1d7027319efbbe0ad7
parent716abaa8e52548e8863831cb32984655f46b5566 (diff)
downloadlinux-b79d8a65d52d3d80204e1bad30ee57bb5a58ced1.tar.gz
linux-b79d8a65d52d3d80204e1bad30ee57bb5a58ced1.tar.bz2
linux-b79d8a65d52d3d80204e1bad30ee57bb5a58ced1.zip
drm/nouveau: add NV18 device id to call_lvds_manufacturer_script
This fixes imac black screen (NV18 card) Signed-off-by: Andrea Tacconi <tacconet@libero.it> Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index ca2fcdf32b84..03f1ddbaa2df 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -3155,7 +3155,7 @@ static int call_lvds_manufacturer_script(struct drm_device *dev, struct dcb_entr
}
#ifdef __powerpc__
/* Powerbook specific quirks */
- if (script == LVDS_RESET && ((dev->pci_device & 0xffff) == 0x0179 || (dev->pci_device & 0xffff) == 0x0329))
+ if (script == LVDS_RESET && ((dev->pci_device & 0xffff) == 0x0179 || (dev->pci_device & 0xffff) == 0x0189 || (dev->pci_device & 0xffff) == 0x0329))
nv_write_tmds(dev, dcbent->or, 0, 0x02, 0x72);
if ((dev->pci_device & 0xffff) == 0x0179 || (dev->pci_device & 0xffff) == 0x0189 || (dev->pci_device & 0xffff) == 0x0329) {
if (script == LVDS_PANEL_ON) {