Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / include / video / sstfb.h

diff --git a/include/video/sstfb.h b/include/video/sstfb.h
index 5dbf5e7..c449eac 100644 (file)
--- a/include/video/sstfb.h
+++ b/include/video/sstfb.h
@@ -68,7 +68,6 @@
 #  define print_var(X,Y...)
 #endif
 
-#define BIT(x)         (1ul<<(x))
 #define POW2(x)                (1ul<<(x))
 
 /*
@@ -119,7 +118,7 @@
 #define BACKPORCH              0x0208
 #define VIDEODIMENSIONS                0x020c
 #define FBIINIT0               0x0210          /* misc+fifo  controls */
-#  define EN_VGA_PASSTHROUGH     BIT(0)
+#  define DIS_VGA_PASSTHROUGH    BIT(0)
 #  define FBI_RESET              BIT(1)
 #  define FIFO_RESET             BIT(2)
 #define FBIINIT1               0x0214          /* PCI + video controls */
@@ -157,7 +156,7 @@
 #define DAC_READ               FBIINIT2        /* in remap mode */
 #define FBIINIT3               0x021c          /* fbi controls */
 #  define DISABLE_TEXTURE        BIT(6)
-#  define Y_SWAP_ORIGIN_SHIFT    22            /* Y swap substraction value */
+#  define Y_SWAP_ORIGIN_SHIFT    22            /* Y swap subtraction value */
 #define HSYNC                  0x0220
 #define VSYNC                  0x0224
 #define DAC_DATA               0x022c
@@ -213,9 +212,9 @@
 #  define DACREG_CR0_24BPP       0x50          /* mode 5 */
 #define        DACREG_CR1_I            0x05
 #define DACREG_CC_I            0x06
-#  define DACREG_CC_CLKA         BIT(7)        /* clk A controled by regs */
+#  define DACREG_CC_CLKA         BIT(7)        /* clk A controlled by regs */
 #  define DACREG_CC_CLKA_C       (2<<4)        /* clk A uses reg C */
-#  define DACREG_CC_CLKB         BIT(3)        /* clk B controled by regs */
+#  define DACREG_CC_CLKB         BIT(3)        /* clk B controlled by regs */
 #  define DACREG_CC_CLKB_D       3             /* clkB uses reg D */
 #define DACREG_AC0_I           0x48            /* clock A reg C */
 #define DACREG_AC1_I           0x49
@@ -251,7 +250,7 @@
 #  define DACREG_ICS_CLK1_A      0     /* bit4 */
 
 /* sst default init registers */
-#define FBIINIT0_DEFAULT EN_VGA_PASSTHROUGH
+#define FBIINIT0_DEFAULT DIS_VGA_PASSTHROUGH
 
 #define FBIINIT1_DEFAULT       \
        (                       \
@@ -296,6 +295,11 @@
  *
  */
 
+/* ioctl to enable/disable VGA passthrough */
+#define SSTFB_SET_VGAPASS      _IOW('F', 0xdd, __u32)
+#define SSTFB_GET_VGAPASS      _IOR('F', 0xdd, __u32)
+
+
 /* used to know witch clock to set */
 enum {
        VID_CLOCK=0,
@@ -317,7 +321,7 @@ struct pll_timing {
 };
 
 struct dac_switch {
-       char * name;
+       const char *name;
        int (*detect) (struct fb_info *info);
        int (*set_pll) (struct fb_info *info, const struct pll_timing *t, const int clock);
        void (*set_vidmod) (struct fb_info *info, const int bpp);
@@ -345,7 +349,7 @@ struct sstfb_par {
        struct pci_dev          *dev;
        int     type;
        u8      revision;
-       int     gfx_clock;      /* status */
+       u8      vgapass;        /* VGA pass through: 1=enabled, 0=disabled */
 };
 
 #endif /* _SSTFB_H_ */