diff options
author | Maik Broemme <mbroemme@plusserver.de> | 2008-04-28 05:15:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:41 -0400 |
commit | 0e170c72c0c55bd78213a0f5053bd9a1dde403b7 (patch) | |
tree | f117d430e70e16aea175a4e7c74fa38e31f93094 /drivers/video/intelfb/intelfbhw.c | |
parent | 0aa163418edfb96ca3b39133979d8e4352aaac3c (diff) |
fbdev: intelfb: add support for the Intel Integrated Graphics Controller 965G/965GM
Add support for the 965G and 965GM graphic chipsets to the intelfb driver. I
have a notebook with an Intel Mobile GM965/GL960 Integrated Graphics
Controller and with the attached patch the framebuffer comes up. I have
tested it a bit with DirectFB to make sure it is working stable.
I also have an Intel Mobile GM945 and I compared the results, the programming
interface of the 9xx series from Intel is mostly the same, so I think the
patch should add all the functionality which the 945GM has.
Signed-off-by: Maik Broemme <mbroemme@plusserver.de>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Antonino Daplas <adaplas@pol.net>
Cc: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/intelfb/intelfbhw.c')
-rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index fa1fff55356..8e6d6a4db0a 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
@@ -143,6 +143,18 @@ int intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo) | |||
143 | dinfo->mobile = 1; | 143 | dinfo->mobile = 1; |
144 | dinfo->pll_index = PLLS_I9xx; | 144 | dinfo->pll_index = PLLS_I9xx; |
145 | return 0; | 145 | return 0; |
146 | case PCI_DEVICE_ID_INTEL_965G: | ||
147 | dinfo->name = "Intel(R) 965G"; | ||
148 | dinfo->chipset = INTEL_965G; | ||
149 | dinfo->mobile = 0; | ||
150 | dinfo->pll_index = PLLS_I9xx; | ||
151 | return 0; | ||
152 | case PCI_DEVICE_ID_INTEL_965GM: | ||
153 | dinfo->name = "Intel(R) 965GM"; | ||
154 | dinfo->chipset = INTEL_965GM; | ||
155 | dinfo->mobile = 1; | ||
156 | dinfo->pll_index = PLLS_I9xx; | ||
157 | return 0; | ||
146 | default: | 158 | default: |
147 | return 1; | 159 | return 1; |
148 | } | 160 | } |
@@ -174,7 +186,9 @@ int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size, | |||
174 | case PCI_DEVICE_ID_INTEL_915GM: | 186 | case PCI_DEVICE_ID_INTEL_915GM: |
175 | case PCI_DEVICE_ID_INTEL_945G: | 187 | case PCI_DEVICE_ID_INTEL_945G: |
176 | case PCI_DEVICE_ID_INTEL_945GM: | 188 | case PCI_DEVICE_ID_INTEL_945GM: |
177 | /* 915 and 945 chipsets support a 256MB aperture. | 189 | case PCI_DEVICE_ID_INTEL_965G: |
190 | case PCI_DEVICE_ID_INTEL_965GM: | ||
191 | /* 915, 945 and 965 chipsets support a 256MB aperture. | ||
178 | Aperture size is determined by inspected the | 192 | Aperture size is determined by inspected the |
179 | base address of the aperture. */ | 193 | base address of the aperture. */ |
180 | if (pci_resource_start(pdev, 2) & 0x08000000) | 194 | if (pci_resource_start(pdev, 2) & 0x08000000) |