git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
video
/
intelfb
/
intelfb.h
diff --git
a/drivers/video/intelfb/intelfb.h
b/drivers/video/intelfb/intelfb.h
index
da29d00
..
e290d74
100644
(file)
--- a/
drivers/video/intelfb/intelfb.h
+++ b/
drivers/video/intelfb/intelfb.h
@@
-8,9
+8,9
@@
/*** Version/name ***/
/*** Version/name ***/
-#define INTELFB_VERSION "0.9.
2
"
+#define INTELFB_VERSION "0.9.
4
"
#define INTELFB_MODULE_NAME "intelfb"
#define INTELFB_MODULE_NAME "intelfb"
-#define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM"
+#define SUPPORTED_CHIPSETS "830M/845G/852GM/855GM/865G/915G/915GM
/945G/945GM
"
/*** Debug/feature defines ***/
/*** Debug/feature defines ***/
@@
-52,11
+52,14
@@
#define PCI_DEVICE_ID_INTEL_865G 0x2572
#define PCI_DEVICE_ID_INTEL_915G 0x2582
#define PCI_DEVICE_ID_INTEL_915GM 0x2592
#define PCI_DEVICE_ID_INTEL_865G 0x2572
#define PCI_DEVICE_ID_INTEL_915G 0x2582
#define PCI_DEVICE_ID_INTEL_915GM 0x2592
+#define PCI_DEVICE_ID_INTEL_945G 0x2772
+#define PCI_DEVICE_ID_INTEL_945GM 0x27A2
/* Size of MMIO region */
#define INTEL_REG_SIZE 0x80000
#define STRIDE_ALIGNMENT 16
/* Size of MMIO region */
#define INTEL_REG_SIZE 0x80000
#define STRIDE_ALIGNMENT 16
+#define STRIDE_ALIGNMENT_I9XX 64
#define PALETTE_8_ENTRIES 256
#define PALETTE_8_ENTRIES 256
@@
-125,7
+128,9
@@
enum intel_chips {
INTEL_855GME,
INTEL_865G,
INTEL_915G,
INTEL_855GME,
INTEL_865G,
INTEL_915G,
- INTEL_915GM
+ INTEL_915GM,
+ INTEL_945G,
+ INTEL_945GM,
};
struct intelfb_hwstate {
};
struct intelfb_hwstate {
@@
-232,7
+237,7
@@
struct intelfb_info {
u32 fb_start;
/* ring buffer */
u32 fb_start;
/* ring buffer */
- u
8 __iomem *
ring_head;
+ u
32
ring_head;
u32 ring_tail;
u32 ring_tail_mask;
u32 ring_space;
u32 ring_tail;
u32 ring_tail_mask;
u32 ring_space;
@@
-277,8
+282,13
@@
struct intelfb_info {
/* driver registered */
int registered;
/* driver registered */
int registered;
+
+ /* index into plls */
+ int pll_index;
};
};
+#define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM))
+
/*** function prototypes ***/
extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var);
/*** function prototypes ***/
extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var);