diff options
author | Dave Airlie <airlied@linux.ie> | 2006-03-22 19:23:55 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-04-02 21:43:28 -0400 |
commit | 9639d5ec07a490134f05ac890506a367aaf8663b (patch) | |
tree | 9e921a2fa9de05dadbb75ab1e63d06df1efd6fa6 | |
parent | 0c187addabbaf93512902442b4a90140a21b0ddc (diff) |
intelfb: add support for i945G
This just adds the defines and structure for i945G
Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r-- | drivers/video/intelfb/intelfb.h | 8 | ||||
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 10 | ||||
-rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 6 |
3 files changed, 17 insertions, 7 deletions
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index d0da38434817..fb2739fb746a 100644 --- a/drivers/video/intelfb/intelfb.h +++ b/drivers/video/intelfb/intelfb.h | |||
@@ -8,9 +8,9 @@ | |||
8 | 8 | ||
9 | 9 | ||
10 | /*** Version/name ***/ | 10 | /*** Version/name ***/ |
11 | #define INTELFB_VERSION "0.9.2" | 11 | #define INTELFB_VERSION "0.9.3" |
12 | #define INTELFB_MODULE_NAME "intelfb" | 12 | #define INTELFB_MODULE_NAME "intelfb" |
13 | #define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM" | 13 | #define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM/945G" |
14 | 14 | ||
15 | 15 | ||
16 | /*** Debug/feature defines ***/ | 16 | /*** Debug/feature defines ***/ |
@@ -52,6 +52,7 @@ | |||
52 | #define PCI_DEVICE_ID_INTEL_865G 0x2572 | 52 | #define PCI_DEVICE_ID_INTEL_865G 0x2572 |
53 | #define PCI_DEVICE_ID_INTEL_915G 0x2582 | 53 | #define PCI_DEVICE_ID_INTEL_915G 0x2582 |
54 | #define PCI_DEVICE_ID_INTEL_915GM 0x2592 | 54 | #define PCI_DEVICE_ID_INTEL_915GM 0x2592 |
55 | #define PCI_DEVICE_ID_INTEL_945G 0x2772 | ||
55 | 56 | ||
56 | /* Size of MMIO region */ | 57 | /* Size of MMIO region */ |
57 | #define INTEL_REG_SIZE 0x80000 | 58 | #define INTEL_REG_SIZE 0x80000 |
@@ -125,7 +126,8 @@ enum intel_chips { | |||
125 | INTEL_855GME, | 126 | INTEL_855GME, |
126 | INTEL_865G, | 127 | INTEL_865G, |
127 | INTEL_915G, | 128 | INTEL_915G, |
128 | INTEL_915GM | 129 | INTEL_915GM, |
130 | INTEL_945G | ||
129 | }; | 131 | }; |
130 | 132 | ||
131 | struct intelfb_hwstate { | 133 | struct intelfb_hwstate { |
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 7fb9f96bab3f..ce45a684bbea 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
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 | * integrated graphics chips. | 5 | * 945G 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 |
@@ -182,6 +182,7 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = { | |||
182 | { 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 }, | 182 | { 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 }, |
183 | { 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 }, | 183 | { 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_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM }, | 184 | { 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_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945G }, | ||
185 | { 0, } | 186 | { 0, } |
186 | }; | 187 | }; |
187 | 188 | ||
@@ -546,10 +547,11 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
546 | 547 | ||
547 | /* Set base addresses. */ | 548 | /* Set base addresses. */ |
548 | if ((ent->device == PCI_DEVICE_ID_INTEL_915G) || | 549 | if ((ent->device == PCI_DEVICE_ID_INTEL_915G) || |
549 | (ent->device == PCI_DEVICE_ID_INTEL_915GM)) { | 550 | (ent->device == PCI_DEVICE_ID_INTEL_915GM) || |
551 | (ent->device == PCI_DEVICE_ID_INTEL_945G)) { | ||
550 | aperture_bar = 2; | 552 | aperture_bar = 2; |
551 | mmio_bar = 0; | 553 | mmio_bar = 0; |
552 | /* Disable HW cursor on 915G/M (not implemented yet) */ | 554 | /* Disable HW cursor on 9x5G/M (not implemented yet) */ |
553 | hwcursor = 0; | 555 | hwcursor = 0; |
554 | } | 556 | } |
555 | dinfo->aperture.physical = pci_resource_start(pdev, aperture_bar); | 557 | dinfo->aperture.physical = pci_resource_start(pdev, aperture_bar); |
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 9a2d8cb4d400..f8c8c0a3f565 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
@@ -128,6 +128,12 @@ intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo) | |||
128 | dinfo->mobile = 1; | 128 | dinfo->mobile = 1; |
129 | dinfo->pll_index = PLLS_I9xx; | 129 | dinfo->pll_index = PLLS_I9xx; |
130 | return 0; | 130 | return 0; |
131 | case PCI_DEVICE_ID_INTEL_945G: | ||
132 | dinfo->name = "Intel(R) 945G"; | ||
133 | dinfo->chipset = INTEL_945G; | ||
134 | dinfo->mobile = 0; | ||
135 | dinfo->pll_index = PLLS_I9xx; | ||
136 | return 0; | ||
131 | default: | 137 | default: |
132 | return 1; | 138 | return 1; |
133 | } | 139 | } |