diff options
Diffstat (limited to 'drivers/video/intelfb/intelfb.h')
-rw-r--r-- | drivers/video/intelfb/intelfb.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index da29d007f215..469b06c29180 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.4" |
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/945GM" |
14 | 14 | ||
15 | 15 | ||
16 | /*** Debug/feature defines ***/ | 16 | /*** Debug/feature defines ***/ |
@@ -52,11 +52,14 @@ | |||
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 | ||
56 | #define PCI_DEVICE_ID_INTEL_945GM 0x27A2 | ||
55 | 57 | ||
56 | /* Size of MMIO region */ | 58 | /* Size of MMIO region */ |
57 | #define INTEL_REG_SIZE 0x80000 | 59 | #define INTEL_REG_SIZE 0x80000 |
58 | 60 | ||
59 | #define STRIDE_ALIGNMENT 16 | 61 | #define STRIDE_ALIGNMENT 16 |
62 | #define STRIDE_ALIGNMENT_I9XX 64 | ||
60 | 63 | ||
61 | #define PALETTE_8_ENTRIES 256 | 64 | #define PALETTE_8_ENTRIES 256 |
62 | 65 | ||
@@ -125,7 +128,9 @@ enum intel_chips { | |||
125 | INTEL_855GME, | 128 | INTEL_855GME, |
126 | INTEL_865G, | 129 | INTEL_865G, |
127 | INTEL_915G, | 130 | INTEL_915G, |
128 | INTEL_915GM | 131 | INTEL_915GM, |
132 | INTEL_945G, | ||
133 | INTEL_945GM, | ||
129 | }; | 134 | }; |
130 | 135 | ||
131 | struct intelfb_hwstate { | 136 | struct intelfb_hwstate { |
@@ -277,8 +282,13 @@ struct intelfb_info { | |||
277 | 282 | ||
278 | /* driver registered */ | 283 | /* driver registered */ |
279 | int registered; | 284 | int registered; |
285 | |||
286 | /* index into plls */ | ||
287 | int pll_index; | ||
280 | }; | 288 | }; |
281 | 289 | ||
290 | #define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM)) | ||
291 | |||
282 | /*** function prototypes ***/ | 292 | /*** function prototypes ***/ |
283 | 293 | ||
284 | extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var); | 294 | extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var); |