diff options
author | Scott MacKenzie <irrational@poboxes.com> | 2005-11-07 04:00:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:49 -0500 |
commit | 3a59026ba111d85b1a86af0f1c4e5a8ef1242d82 (patch) | |
tree | 33aadf52d17ffaf5a3077550c1813f26f14d571d | |
parent | b8c49ef6aeef662e7920435012be8c2ecc41c30d (diff) |
[PATCH] intelfb: extend partial support of i915G to include i915GM
Add partial support for GMA900 within the i915GM chipset.
Signed-off-by: Scott MacKenzie <irrational@poboxes.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/video/intelfb/intelfb.h | 6 | ||||
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 8 | ||||
-rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 5 |
3 files changed, 14 insertions, 5 deletions
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index 011e11626558..f077ca34faba 100644 --- a/drivers/video/intelfb/intelfb.h +++ b/drivers/video/intelfb/intelfb.h | |||
@@ -10,7 +10,7 @@ | |||
10 | /*** Version/name ***/ | 10 | /*** Version/name ***/ |
11 | #define INTELFB_VERSION "0.9.2" | 11 | #define INTELFB_VERSION "0.9.2" |
12 | #define INTELFB_MODULE_NAME "intelfb" | 12 | #define INTELFB_MODULE_NAME "intelfb" |
13 | #define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G" | 13 | #define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM" |
14 | 14 | ||
15 | 15 | ||
16 | /*** Debug/feature defines ***/ | 16 | /*** Debug/feature defines ***/ |
@@ -47,6 +47,7 @@ | |||
47 | #define PCI_DEVICE_ID_INTEL_85XGM 0x3582 | 47 | #define PCI_DEVICE_ID_INTEL_85XGM 0x3582 |
48 | #define PCI_DEVICE_ID_INTEL_865G 0x2572 | 48 | #define PCI_DEVICE_ID_INTEL_865G 0x2572 |
49 | #define PCI_DEVICE_ID_INTEL_915G 0x2582 | 49 | #define PCI_DEVICE_ID_INTEL_915G 0x2582 |
50 | #define PCI_DEVICE_ID_INTEL_915GM 0x2592 | ||
50 | 51 | ||
51 | /* Size of MMIO region */ | 52 | /* Size of MMIO region */ |
52 | #define INTEL_REG_SIZE 0x80000 | 53 | #define INTEL_REG_SIZE 0x80000 |
@@ -119,7 +120,8 @@ enum intel_chips { | |||
119 | INTEL_855GM, | 120 | INTEL_855GM, |
120 | INTEL_855GME, | 121 | INTEL_855GME, |
121 | INTEL_865G, | 122 | INTEL_865G, |
122 | INTEL_915G | 123 | INTEL_915G, |
124 | INTEL_915GM | ||
123 | }; | 125 | }; |
124 | 126 | ||
125 | struct intelfb_hwstate { | 127 | struct intelfb_hwstate { |
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 80a09344f1aa..e6d75b926dc8 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * intelfb | 2 | * intelfb |
3 | * | 3 | * |
4 | * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G | 4 | * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM |
5 | * integrated graphics chips. | 5 | * integrated graphics chips. |
6 | * | 6 | * |
7 | * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org> | 7 | * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org> |
@@ -186,6 +186,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = { | |||
186 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_85XGM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_85XGM }, | 186 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_85XGM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_85XGM }, |
187 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_865G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_865G }, | 187 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_865G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_865G }, |
188 | { 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 }, | 188 | { 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 }, |
189 | { 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 }, | ||
189 | { 0, } | 190 | { 0, } |
190 | }; | 191 | }; |
191 | 192 | ||
@@ -549,10 +550,11 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
549 | } | 550 | } |
550 | 551 | ||
551 | /* Set base addresses. */ | 552 | /* Set base addresses. */ |
552 | if (ent->device == PCI_DEVICE_ID_INTEL_915G) { | 553 | if ((ent->device == PCI_DEVICE_ID_INTEL_915G) || |
554 | (ent->device == PCI_DEVICE_ID_INTEL_915GM)) { | ||
553 | aperture_bar = 2; | 555 | aperture_bar = 2; |
554 | mmio_bar = 0; | 556 | mmio_bar = 0; |
555 | /* Disable HW cursor on 915G (not implemented yet) */ | 557 | /* Disable HW cursor on 915G/M (not implemented yet) */ |
556 | hwcursor = 0; | 558 | hwcursor = 0; |
557 | } | 559 | } |
558 | dinfo->aperture.physical = pci_resource_start(pdev, aperture_bar); | 560 | dinfo->aperture.physical = pci_resource_start(pdev, aperture_bar); |
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 5bafc3c54db7..ac94c2e5ff85 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
@@ -99,6 +99,11 @@ intelfbhw_get_chipset(struct pci_dev *pdev, const char **name, int *chipset, | |||
99 | *chipset = INTEL_915G; | 99 | *chipset = INTEL_915G; |
100 | *mobile = 0; | 100 | *mobile = 0; |
101 | return 0; | 101 | return 0; |
102 | case PCI_DEVICE_ID_INTEL_915GM: | ||
103 | *name = "Intel(R) 915GM"; | ||
104 | *chipset = INTEL_915GM; | ||
105 | *mobile = 1; | ||
106 | return 0; | ||
102 | default: | 107 | default: |
103 | return 1; | 108 | return 1; |
104 | } | 109 | } |