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/intelfb.h | |
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/intelfb.h')
-rw-r--r-- | drivers/video/intelfb/intelfb.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index 836796177942..3325fbd68ab3 100644 --- a/drivers/video/intelfb/intelfb.h +++ b/drivers/video/intelfb/intelfb.h | |||
@@ -12,9 +12,9 @@ | |||
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | /*** Version/name ***/ | 14 | /*** Version/name ***/ |
15 | #define INTELFB_VERSION "0.9.4" | 15 | #define INTELFB_VERSION "0.9.5" |
16 | #define INTELFB_MODULE_NAME "intelfb" | 16 | #define INTELFB_MODULE_NAME "intelfb" |
17 | #define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM" | 17 | #define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM" |
18 | 18 | ||
19 | 19 | ||
20 | /*** Debug/feature defines ***/ | 20 | /*** Debug/feature defines ***/ |
@@ -58,6 +58,8 @@ | |||
58 | #define PCI_DEVICE_ID_INTEL_915GM 0x2592 | 58 | #define PCI_DEVICE_ID_INTEL_915GM 0x2592 |
59 | #define PCI_DEVICE_ID_INTEL_945G 0x2772 | 59 | #define PCI_DEVICE_ID_INTEL_945G 0x2772 |
60 | #define PCI_DEVICE_ID_INTEL_945GM 0x27A2 | 60 | #define PCI_DEVICE_ID_INTEL_945GM 0x27A2 |
61 | #define PCI_DEVICE_ID_INTEL_965G 0x29A2 | ||
62 | #define PCI_DEVICE_ID_INTEL_965GM 0x2A02 | ||
61 | 63 | ||
62 | /* Size of MMIO region */ | 64 | /* Size of MMIO region */ |
63 | #define INTEL_REG_SIZE 0x80000 | 65 | #define INTEL_REG_SIZE 0x80000 |
@@ -158,6 +160,8 @@ enum intel_chips { | |||
158 | INTEL_915GM, | 160 | INTEL_915GM, |
159 | INTEL_945G, | 161 | INTEL_945G, |
160 | INTEL_945GM, | 162 | INTEL_945GM, |
163 | INTEL_965G, | ||
164 | INTEL_965GM, | ||
161 | }; | 165 | }; |
162 | 166 | ||
163 | struct intelfb_hwstate { | 167 | struct intelfb_hwstate { |
@@ -358,7 +362,9 @@ struct intelfb_info { | |||
358 | #define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G) || \ | 362 | #define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G) || \ |
359 | ((dinfo)->chipset == INTEL_915GM) || \ | 363 | ((dinfo)->chipset == INTEL_915GM) || \ |
360 | ((dinfo)->chipset == INTEL_945G) || \ | 364 | ((dinfo)->chipset == INTEL_945G) || \ |
361 | ((dinfo)->chipset==INTEL_945GM)) | 365 | ((dinfo)->chipset == INTEL_945GM) || \ |
366 | ((dinfo)->chipset == INTEL_965G) || \ | ||
367 | ((dinfo)->chipset == INTEL_965GM)) | ||
362 | 368 | ||
363 | #ifndef FBIO_WAITFORVSYNC | 369 | #ifndef FBIO_WAITFORVSYNC |
364 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) | 370 | #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) |