diff options
Diffstat (limited to 'include/video/sstfb.h')
-rw-r--r-- | include/video/sstfb.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/video/sstfb.h b/include/video/sstfb.h index 5dbf5e7e50a8..baa163f770ab 100644 --- a/include/video/sstfb.h +++ b/include/video/sstfb.h | |||
@@ -119,7 +119,7 @@ | |||
119 | #define BACKPORCH 0x0208 | 119 | #define BACKPORCH 0x0208 |
120 | #define VIDEODIMENSIONS 0x020c | 120 | #define VIDEODIMENSIONS 0x020c |
121 | #define FBIINIT0 0x0210 /* misc+fifo controls */ | 121 | #define FBIINIT0 0x0210 /* misc+fifo controls */ |
122 | # define EN_VGA_PASSTHROUGH BIT(0) | 122 | # define DIS_VGA_PASSTHROUGH BIT(0) |
123 | # define FBI_RESET BIT(1) | 123 | # define FBI_RESET BIT(1) |
124 | # define FIFO_RESET BIT(2) | 124 | # define FIFO_RESET BIT(2) |
125 | #define FBIINIT1 0x0214 /* PCI + video controls */ | 125 | #define FBIINIT1 0x0214 /* PCI + video controls */ |
@@ -251,7 +251,7 @@ | |||
251 | # define DACREG_ICS_CLK1_A 0 /* bit4 */ | 251 | # define DACREG_ICS_CLK1_A 0 /* bit4 */ |
252 | 252 | ||
253 | /* sst default init registers */ | 253 | /* sst default init registers */ |
254 | #define FBIINIT0_DEFAULT EN_VGA_PASSTHROUGH | 254 | #define FBIINIT0_DEFAULT DIS_VGA_PASSTHROUGH |
255 | 255 | ||
256 | #define FBIINIT1_DEFAULT \ | 256 | #define FBIINIT1_DEFAULT \ |
257 | ( \ | 257 | ( \ |
@@ -296,6 +296,11 @@ | |||
296 | * | 296 | * |
297 | */ | 297 | */ |
298 | 298 | ||
299 | /* ioctl to enable/disable VGA passthrough */ | ||
300 | #define SSTFB_SET_VGAPASS _IOW('F', 0xdd, __u32) | ||
301 | #define SSTFB_GET_VGAPASS _IOR('F', 0xdd, __u32) | ||
302 | |||
303 | |||
299 | /* used to know witch clock to set */ | 304 | /* used to know witch clock to set */ |
300 | enum { | 305 | enum { |
301 | VID_CLOCK=0, | 306 | VID_CLOCK=0, |
@@ -317,7 +322,7 @@ struct pll_timing { | |||
317 | }; | 322 | }; |
318 | 323 | ||
319 | struct dac_switch { | 324 | struct dac_switch { |
320 | char * name; | 325 | const char *name; |
321 | int (*detect) (struct fb_info *info); | 326 | int (*detect) (struct fb_info *info); |
322 | int (*set_pll) (struct fb_info *info, const struct pll_timing *t, const int clock); | 327 | int (*set_pll) (struct fb_info *info, const struct pll_timing *t, const int clock); |
323 | void (*set_vidmod) (struct fb_info *info, const int bpp); | 328 | void (*set_vidmod) (struct fb_info *info, const int bpp); |
@@ -345,7 +350,7 @@ struct sstfb_par { | |||
345 | struct pci_dev *dev; | 350 | struct pci_dev *dev; |
346 | int type; | 351 | int type; |
347 | u8 revision; | 352 | u8 revision; |
348 | int gfx_clock; /* status */ | 353 | u8 vgapass; /* VGA pass through: 1=enabled, 0=disabled */ |
349 | }; | 354 | }; |
350 | 355 | ||
351 | #endif /* _SSTFB_H_ */ | 356 | #endif /* _SSTFB_H_ */ |