fbdev: move FBIO_WAITFORVSYNC to linux/fb.h

[safe/jmp/linux-2.6] / drivers / video / intelfb / intelfb.h

diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index 80b94c1..6b51175 100644 (file)
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -12,9 +12,9 @@
 #endif
 
 /*** Version/name ***/
 #endif
 
 /*** Version/name ***/

-#define INTELFB_VERSION                        "0.9.4"
+#define INTELFB_VERSION                        "0.9.6"

 #define INTELFB_MODULE_NAME            "intelfb"
 #define INTELFB_MODULE_NAME            "intelfb"

-#define SUPPORTED_CHIPSETS             "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM"
+#define SUPPORTED_CHIPSETS             "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/945GME/965G/965GM"

 
 
 /*** Debug/feature defines ***/
 
 
 /*** Debug/feature defines ***/


@@ -53,11 +53,15 @@
 #define PCI_DEVICE_ID_INTEL_830M       0x3577
 #define PCI_DEVICE_ID_INTEL_845G       0x2562
 #define PCI_DEVICE_ID_INTEL_85XGM      0x3582
 #define PCI_DEVICE_ID_INTEL_830M       0x3577
 #define PCI_DEVICE_ID_INTEL_845G       0x2562
 #define PCI_DEVICE_ID_INTEL_85XGM      0x3582

+#define PCI_DEVICE_ID_INTEL_854                0x358E

 #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
 #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

+#define PCI_DEVICE_ID_INTEL_945GME     0x27AE
+#define PCI_DEVICE_ID_INTEL_965G       0x29A2
+#define PCI_DEVICE_ID_INTEL_965GM      0x2A02

 
 /* Size of MMIO region */
 #define INTEL_REG_SIZE                 0x80000
 
 /* Size of MMIO region */
 #define INTEL_REG_SIZE                 0x80000


@@ -111,7 +115,7 @@
 
 #define FIXED_MODE(d) ((d)->fixed_mode)
 
 
 #define FIXED_MODE(d) ((d)->fixed_mode)
 

-/*** Driver paramters ***/
+/*** Driver parameters ***/

 
 #define RINGBUFFER_SIZE                KB(64)
 #define HW_CURSOR_SIZE         KB(4)
 
 #define RINGBUFFER_SIZE                KB(64)
 #define HW_CURSOR_SIZE         KB(4)


@@ -151,6 +155,7 @@ enum intel_chips {
        INTEL_85XGM,
        INTEL_852GM,
        INTEL_852GME,
        INTEL_85XGM,
        INTEL_852GM,
        INTEL_852GME,

+       INTEL_854,

        INTEL_855GM,
        INTEL_855GME,
        INTEL_865G,
        INTEL_855GM,
        INTEL_855GME,
        INTEL_865G,


@@ -158,6 +163,9 @@ enum intel_chips {
        INTEL_915GM,
        INTEL_945G,
        INTEL_945GM,
        INTEL_915GM,
        INTEL_945G,
        INTEL_945GM,

+       INTEL_945GME,
+       INTEL_965G,
+       INTEL_965GM,

 };
 
 struct intelfb_hwstate {
 };
 
 struct intelfb_hwstate {


@@ -231,8 +239,8 @@ struct intelfb_hwstate {
 struct intelfb_heap_data {
        u32 physical;
        u8 __iomem *virtual;
 struct intelfb_heap_data {
        u32 physical;
        u8 __iomem *virtual;

-       u32 offset;  // in GATT pages
-       u32 size;    // in bytes
+       u32 offset;             /* in GATT pages */
+       u32 size;               /* in bytes */

 };
 
 #ifdef CONFIG_FB_INTEL_I2C
 };
 
 #ifdef CONFIG_FB_INTEL_I2C


@@ -270,9 +278,9 @@ struct intelfb_info {
        struct intelfb_hwstate save_state;
 
        /* agpgart structs */
        struct intelfb_hwstate save_state;
 
        /* agpgart structs */

-       struct agp_memory *gtt_fb_mem;     // use all stolen memory or vram
-       struct agp_memory *gtt_ring_mem;   // ring buffer
-       struct agp_memory *gtt_cursor_mem; // hw cursor
+       struct agp_memory *gtt_fb_mem;     /* use all stolen memory or vram */
+       struct agp_memory *gtt_ring_mem;   /* ring buffer */
+       struct agp_memory *gtt_cursor_mem; /* hw cursor */

 
        /* use a gart reserved fb mem */
        u8 fbmem_gart;
 
        /* use a gart reserved fb mem */
        u8 fbmem_gart;


@@ -302,7 +310,7 @@ struct intelfb_info {
        u32 ring_lockup;
 
        /* palette */
        u32 ring_lockup;
 
        /* palette */

-       u32 pseudo_palette[17];
+       u32 pseudo_palette[16];

 
        /* chip info */
        int pci_chipset;
 
        /* chip info */
        int pci_chipset;


@@ -346,7 +354,7 @@ struct intelfb_info {
 
        /* driver registered */
        int registered;
 
        /* driver registered */
        int registered;

-       
+

        /* index into plls */
        int pll_index;
 
        /* index into plls */
        int pll_index;
 


@@ -355,11 +363,13 @@ struct intelfb_info {
        struct intelfb_output_rec output[MAX_OUTPUTS];
 };
 
        struct intelfb_output_rec output[MAX_OUTPUTS];
 };
 

-#define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM))
-
-#ifndef FBIO_WAITFORVSYNC
-#define FBIO_WAITFORVSYNC      _IOW('F', 0x20, __u32)
-#endif
+#define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G) ||    \
+                       ((dinfo)->chipset == INTEL_915GM) ||    \
+                       ((dinfo)->chipset == INTEL_945G) ||     \
+                       ((dinfo)->chipset == INTEL_945GM) ||    \
+                       ((dinfo)->chipset == INTEL_945GME) ||   \
+                       ((dinfo)->chipset == INTEL_965G) ||     \
+                       ((dinfo)->chipset == INTEL_965GM))

 
 /*** function prototypes ***/
 
 
 /*** function prototypes ***/