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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
video
/
sstfb.h
diff --git
a/include/video/sstfb.h
b/include/video/sstfb.h
index
3570f9c
..
baa163f
100644
(file)
--- a/
include/video/sstfb.h
+++ b/
include/video/sstfb.h
@@
-68,10
+68,6
@@
# define print_var(X,Y...)
#endif
# define print_var(X,Y...)
#endif
-#define eprintk(X...) printk(KERN_ERR "sstfb: " X)
-#define iprintk(X...) printk(KERN_INFO "sstfb: " X)
-#define wprintk(X...) printk(KERN_WARNING "sstfb: " X)
-
#define BIT(x) (1ul<<(x))
#define POW2(x) (1ul<<(x))
#define BIT(x) (1ul<<(x))
#define POW2(x) (1ul<<(x))
@@
-123,7
+119,7
@@
#define BACKPORCH 0x0208
#define VIDEODIMENSIONS 0x020c
#define FBIINIT0 0x0210 /* misc+fifo controls */
#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 */
# define FBI_RESET BIT(1)
# define FIFO_RESET BIT(2)
#define FBIINIT1 0x0214 /* PCI + video controls */
@@
-255,7
+251,7
@@
# define DACREG_ICS_CLK1_A 0 /* bit4 */
/* sst default init registers */
# 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 \
( \
#define FBIINIT1_DEFAULT \
( \
@@
-300,6
+296,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,
/* used to know witch clock to set */
enum {
VID_CLOCK=0,
@@
-321,7
+322,7
@@
struct pll_timing {
};
struct dac_switch {
};
struct dac_switch {
- c
har *
name;
+ c
onst 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);
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);
@@
-349,7
+350,7
@@
struct sstfb_par {
struct pci_dev *dev;
int type;
u8 revision;
struct pci_dev *dev;
int type;
u8 revision;
-
int gfx_clock; /* status
*/
+
u8 vgapass; /* VGA pass through: 1=enabled, 0=disabled
*/
};
#endif /* _SSTFB_H_ */
};
#endif /* _SSTFB_H_ */