diff options
author | Dave Airlie <airlied@linux.ie> | 2006-03-23 05:53:05 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-04-02 21:43:28 -0400 |
commit | 9a90603f65dd5046ddcd586158abcad7784892b6 (patch) | |
tree | e522d2fbc83a491ed50cee596a4c5d983460c2b4 /drivers/video/intelfb/intelfbdrv.c | |
parent | 8b91b0b4f2d731b92f59bc82492769a09b4955a6 (diff) |
intelfb: add i945GM support
Untested i945GM support just add the framework.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/video/intelfb/intelfbdrv.c')
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index f659ca8d1652..54ce74547a3e 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * intelfb | 2 | * intelfb |
3 | * | 3 | * |
4 | * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/ | 4 | * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/ |
5 | * 945G integrated graphics chips. | 5 | * 945G/945GM integrated graphics chips. |
6 | * | 6 | * |
7 | * Copyright � 2002, 2003 David Dawes <dawes@xfree86.org> | 7 | * Copyright � 2002, 2003 David Dawes <dawes@xfree86.org> |
8 | * 2004 Sylvain Meyer | 8 | * 2004 Sylvain Meyer |
@@ -184,6 +184,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = { | |||
184 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915G }, | 184 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915G }, |
185 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM }, | 185 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM }, |
186 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945G }, | 186 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945G }, |
187 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945GM }, | ||
187 | { 0, } | 188 | { 0, } |
188 | }; | 189 | }; |
189 | 190 | ||
@@ -549,7 +550,8 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
549 | /* Set base addresses. */ | 550 | /* Set base addresses. */ |
550 | if ((ent->device == PCI_DEVICE_ID_INTEL_915G) || | 551 | if ((ent->device == PCI_DEVICE_ID_INTEL_915G) || |
551 | (ent->device == PCI_DEVICE_ID_INTEL_915GM) || | 552 | (ent->device == PCI_DEVICE_ID_INTEL_915GM) || |
552 | (ent->device == PCI_DEVICE_ID_INTEL_945G)) { | 553 | (ent->device == PCI_DEVICE_ID_INTEL_945G) || |
554 | (ent->device == PCI_DEVICE_ID_INTEL_945GM)) { | ||
553 | aperture_bar = 2; | 555 | aperture_bar = 2; |
554 | mmio_bar = 0; | 556 | mmio_bar = 0; |
555 | } | 557 | } |