diff options
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/cyblafb.h | 4 | ||||
| -rw-r--r-- | include/video/kyro.h | 1 | ||||
| -rw-r--r-- | include/video/neomagic.h | 1 | ||||
| -rw-r--r-- | include/video/newport.h | 5 | ||||
| -rw-r--r-- | include/video/sstfb.h | 1 | ||||
| -rw-r--r-- | include/video/tdfx.h | 86 |
6 files changed, 53 insertions, 45 deletions
diff --git a/include/video/cyblafb.h b/include/video/cyblafb.h index a9948232b13..71744057538 100644 --- a/include/video/cyblafb.h +++ b/include/video/cyblafb.h @@ -153,6 +153,10 @@ #define GE04 (GEBase+0x04) // source 2, p 111 #define GE08 (GEBase+0x08) // destination 1, p 111 #define GE0C (GEBase+0x0C) // destination 2, p 112 +#define GE10 (GEBase+0x10) // right view base & enable, p 112 +#define GE13 (GEBase+0x13) // left view base & enable, p 112 +#define GE18 (GEBase+0x18) // block write start address, p 112 +#define GE1C (GEBase+0x1C) // block write end address, p 112 #define GE20 (GEBase+0x20) // engine status, p 113 #define GE24 (GEBase+0x24) // reset all GE pointers #define GE44 (GEBase+0x44) // command register, p 126 diff --git a/include/video/kyro.h b/include/video/kyro.h index 1bed37cfa68..dba7de2ee4a 100644 --- a/include/video/kyro.h +++ b/include/video/kyro.h @@ -15,6 +15,7 @@ struct kyrofb_info { void __iomem *regbase; + u32 palette[16]; u32 HTot; /* Hor Total Time */ u32 HFP; /* Hor Front Porch */ u32 HST; /* Hor Sync Time */ diff --git a/include/video/neomagic.h b/include/video/neomagic.h index bdaee70868d..1d69049bd4c 100644 --- a/include/video/neomagic.h +++ b/include/video/neomagic.h @@ -196,6 +196,7 @@ struct neofb_par { int internal_display; int external_display; int libretto; + u32 palette[16]; }; typedef struct { diff --git a/include/video/newport.h b/include/video/newport.h index 812dac5b55f..1f5ebeaa818 100644 --- a/include/video/newport.h +++ b/include/video/newport.h @@ -382,7 +382,8 @@ typedef struct { #define VC2_IREG_CONTROL 0x10 #define VC2_IREG_CONFIG 0x20 -extern __inline__ void newport_vc2_set(struct newport_regs *regs, unsigned char vc2ireg, +static inline void newport_vc2_set(struct newport_regs *regs, + unsigned char vc2ireg, unsigned short val) { regs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_INDEX | NPORT_DMODE_W3 | @@ -390,7 +391,7 @@ extern __inline__ void newport_vc2_set(struct newport_regs *regs, unsigned char regs->set.dcbdata0.byword = (vc2ireg << 24) | (val << 8); } -extern __inline__ unsigned short newport_vc2_get(struct newport_regs *regs, +static inline unsigned short newport_vc2_get(struct newport_regs *regs, unsigned char vc2ireg) { regs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_INDEX | NPORT_DMODE_W1 | diff --git a/include/video/sstfb.h b/include/video/sstfb.h index 0d77b520537..3570f9c9b11 100644 --- a/include/video/sstfb.h +++ b/include/video/sstfb.h @@ -334,6 +334,7 @@ struct sst_spec { }; struct sstfb_par { + u32 palette[16]; unsigned int yDim; unsigned int hSyncOn; /* hsync_len */ unsigned int hSyncOff; /* left_margin + xres + right_margin */ diff --git a/include/video/tdfx.h b/include/video/tdfx.h index 04237676b17..c1cc94ba3fd 100644 --- a/include/video/tdfx.h +++ b/include/video/tdfx.h @@ -140,52 +140,52 @@ #ifdef __KERNEL__ struct banshee_reg { - /* VGA rubbish */ - unsigned char att[21]; - unsigned char crt[25]; - unsigned char gra[ 9]; - unsigned char misc[1]; - unsigned char seq[ 5]; - - /* Banshee extensions */ - unsigned char ext[2]; - unsigned long vidcfg; - unsigned long vidpll; - unsigned long mempll; - unsigned long gfxpll; - unsigned long dacmode; - unsigned long vgainit0; - unsigned long vgainit1; - unsigned long screensize; - unsigned long stride; - unsigned long cursloc; - unsigned long curspataddr; - unsigned long cursc0; - unsigned long cursc1; - unsigned long startaddr; - unsigned long clip0min; - unsigned long clip0max; - unsigned long clip1min; - unsigned long clip1max; - unsigned long srcbase; - unsigned long dstbase; - unsigned long miscinit0; + /* VGA rubbish */ + unsigned char att[21]; + unsigned char crt[25]; + unsigned char gra[ 9]; + unsigned char misc[1]; + unsigned char seq[ 5]; + + /* Banshee extensions */ + unsigned char ext[2]; + unsigned long vidcfg; + unsigned long vidpll; + unsigned long mempll; + unsigned long gfxpll; + unsigned long dacmode; + unsigned long vgainit0; + unsigned long vgainit1; + unsigned long screensize; + unsigned long stride; + unsigned long cursloc; + unsigned long curspataddr; + unsigned long cursc0; + unsigned long cursc1; + unsigned long startaddr; + unsigned long clip0min; + unsigned long clip0max; + unsigned long clip1min; + unsigned long clip1max; + unsigned long srcbase; + unsigned long dstbase; + unsigned long miscinit0; }; struct tdfx_par { - u32 max_pixclock; - - void __iomem *regbase_virt; - unsigned long iobase; - u32 baseline; - - struct { - int w,u,d; - unsigned long enable,disable; - struct timer_list timer; - } hwcursor; - - spinlock_t DAClock; + u32 max_pixclock; + u32 palette[16]; + void __iomem *regbase_virt; + unsigned long iobase; + u32 baseline; + + struct { + int w,u,d; + unsigned long enable,disable; + struct timer_list timer; + } hwcursor; + + spinlock_t DAClock; }; #endif /* __KERNEL__ */ |