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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
video
/
neomagic.h
diff --git
a/include/video/neomagic.h
b/include/video/neomagic.h
index
21953f8
..
78b1f15
100644
(file)
--- a/
include/video/neomagic.h
+++ b/
include/video/neomagic.h
@@
-69,6
+69,9
@@
#define NEO_ICON128_ENABLE 0x0000000C
#define NEO_ICON_BLANK 0x00000010
#define NEO_ICON128_ENABLE 0x0000000C
#define NEO_ICON_BLANK 0x00000010
+#define NEO_GR01_SUPPRESS_VSYNC 0x10
+#define NEO_GR01_SUPPRESS_HSYNC 0x20
+
#ifdef __KERNEL__
#ifdef NEOFB_DEBUG
#ifdef __KERNEL__
#ifdef NEOFB_DEBUG
@@
-156,6
+159,7
@@
struct neofb_par {
unsigned char PanelDispCntlReg1;
unsigned char PanelDispCntlReg2;
unsigned char PanelDispCntlReg3;
unsigned char PanelDispCntlReg1;
unsigned char PanelDispCntlReg2;
unsigned char PanelDispCntlReg3;
+ unsigned char PanelDispCntlRegRead;
unsigned char PanelVertCenterReg1;
unsigned char PanelVertCenterReg2;
unsigned char PanelVertCenterReg3;
unsigned char PanelVertCenterReg1;
unsigned char PanelVertCenterReg2;
unsigned char PanelVertCenterReg3;
@@
-176,11
+180,11
@@
struct neofb_par {
#ifdef CONFIG_MTRR
int mtrr;
#endif
#ifdef CONFIG_MTRR
int mtrr;
#endif
- u8 *mmio_vbase;
+ u8
__iomem
*mmio_vbase;
u8 cursorOff;
u8 *cursorPad; /* Must die !! */
u8 cursorOff;
u8 *cursorPad; /* Must die !! */
- Neo2200 *neo2200;
+ Neo2200
__iomem
*neo2200;
/* Panels size */
int NeoPanelWidth;
/* Panels size */
int NeoPanelWidth;
@@
-193,6
+197,7
@@
struct neofb_par {
int internal_display;
int external_display;
int libretto;
int internal_display;
int external_display;
int libretto;
+ u32 palette[16];
};
typedef struct {
};
typedef struct {