Menu
▾
▴
[Linuxconsole-commit] CVS: ruby/linux/drivers/video Config.in,1.48,1.49 Makefile,1.41,1.42 fbmem.c,1.49,1.50
|
From: James S. <jsi...@us...> - 2001-10-06 16:11:17
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv25708/linux/drivers/video
Modified Files:
Config.in Makefile fbmem.c
Log Message:
Synced to 2.4.10
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Config.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Config.in 2001/08/22 11:07:57 1.48
+++ Config.in 2001/10/06 16:11:13 1.49
@@ -86,6 +86,9 @@
bool ' S3 Trio display support' CONFIG_FB_S3TRIO
tristate ' VGA 16-color graphics console' CONFIG_FB_VGA16
fi
+ if [ "$CONFIG_PARISC" = "y" ]; then
+ bool ' Generic STI frame buffer device support' CONFIG_FB_STI
+ fi
if [ "$CONFIG_MAC" = "y" ]; then
define_bool CONFIG_FB_MAC y
bool ' Apple "valkyrie" display support' CONFIG_FB_VALKYRIE
@@ -124,12 +127,16 @@
bool ' CGsix (GX,TurboGX) support' CONFIG_FB_CGSIX
fi
fi
- tristate ' NEC PowerVR 2 display support' CONFIG_FB_PVR2
- dep_bool ' Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
+ if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
+ tristate ' NEC PowerVR 2 display support' CONFIG_FB_PVR2
+ dep_bool ' Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
+ fi
bool ' Epson 1355 framebuffer support' CONFIG_FB_E1355
if [ "$CONFIG_FB_E1355" = "y" ]; then
- hex ' Register Base Address' CONFIG_E1355_REG_BASE a8000000
- hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
+ if [ "$CONFIG_SUPERH" = "y" ]; then
+ hex ' Register Base Address' CONFIG_E1355_REG_BASE a8000000
+ hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
+ fi
fi
if [ "$CONFIG_PCI" != "n" ]; then
tristate ' Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX
@@ -150,14 +157,21 @@
if [ "$CONFIG_FB_ATY" != "n" ]; then
bool ' Mach64 GX support (EXPERIMENTAL)' CONFIG_FB_ATY_GX
bool ' Mach64 CT/VT/GT/LT (incl. 3D RAGE) support' CONFIG_FB_ATY_CT
+ if [ "$CONFIG_FB_ATY_CT" = "y" ]; then
+ bool ' Sony Vaio C1VE 1024x480 LCD support' CONFIG_FB_ATY_CT_VAIO_LCD
+ fi
fi
+ tristate ' ATI Radeon display support (EXPERIMENTAL)' CONFIG_FB_RADEON
tristate ' ATI Rage 128 display support (EXPERIMENTAL)' CONFIG_FB_ATY128
tristate ' 3Dfx acceleration support' CONFIG_FB_TDFX
if [ "$CONFIG_FB_TDFX" != "n" ]; then
bool ' 3Dfx Banshee/Voodoo3 display support (EXPERIMENTAL)' CONFIG_FB_3DFX
- bool ' Voodoo 1 display support (EXPERIMENTAL)' CONFIG_FB_SST
- fi
- tristate ' SIS 630/540 display support (EXPERIMENTAL)' CONFIG_FB_SIS
+ bool ' 3Dfx Voodoo Graphics (sst1) support (EXPERIMENTAL)' CONFIG_FB_VOODOO1
+ fi
+ if [ "$CONFIG_FB_SIS" != "n" ]; then
+ bool ' SIS 630/540/730 support' CONFIG_FB_SIS_300
+ bool ' SIS 315H/315 support' CONFIG_FB_SIS_315
+ fi
fi
if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
bool ' SBUS and UPA framebuffers' CONFIG_FB_SBUS
@@ -197,6 +211,16 @@
fi
if [ "$CONFIG_HD64461" = "y" ]; then
tristate ' HD64461 Frame Buffer support' CONFIG_FB_HIT
+ fi
+ if [ "$CONFIG_DECSTATION" = "y" ]; then
+ if [ "$CONFIG_TC" = "y" ]; then
+ bool ' PMAG-BA TURBOchannel framebuffer support' CONFIG_FB_PMAG_BA
+ bool ' PMAGB-B TURBOchannel framebuffer spport' CONFIG_FB_PMAGB_B
+ bool ' Maxine (Personal DECstation) onboard framebuffer spport' CONFIG_FB_MAXINE
+ fi
+ fi
+ if [ "$CONFIG_NINO" = "y" ]; then
+ bool ' TMPTX3912/PR31700 frame buffer support' CONFIG_FB_TX3912
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate ' Virtual Frame Buffer support (ONLY FOR TESTING!)' CONFIG_FB_VIRTUAL
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile 2001/09/09 16:36:34 1.41
+++ Makefile 2001/10/06 16:11:13 1.42
@@ -17,6 +17,7 @@
obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o
obj-$(CONFIG_PROM_CONSOLE) += promcon.o promcon_tbl.o
+obj-$(CONFIG_STI_CONSOLE) += sticon.o sticon-bmode.o sticore.o
obj-$(CONFIG_VGA_CONSOLE) += vgacon.o vga.o
obj-$(CONFIG_MDA_CONSOLE) += mdacon.o
obj-$(CONFIG_NVIDIA_CONSOLE) += nvvgacon.o
@@ -42,6 +43,7 @@
obj-$(CONFIG_FB_Q40) += q40fb.o
obj-$(CONFIG_FB_ATARI) += atafb.o
obj-$(CONFIG_FB_ATY128) += aty128fb.o
+obj-$(CONFIG_FB_RADEON) += radeonfb.o
obj-$(CONFIG_FB_IGA) += igafb.o
obj-$(CONFIG_FB_CONTROL) += controlfb.o
obj-$(CONFIG_FB_PLATINUM) += platinumfb.o
@@ -72,6 +74,11 @@
obj-$(CONFIG_FB_CGFOURTEEN) += cgfourteenfb.o sbusfb.o
obj-$(CONFIG_FB_P9100) += p9100fb.o sbusfb.o
obj-$(CONFIG_FB_LEO) += leofb.o sbusfb.o
+obj-$(CONFIG_FB_STI) += stifb.o sticore.o fbgen.o
+obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o
+obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o
+obj-$(CONFIG_FB_MAXINE) += maxinefb.o
+obj-$(CONFIG_FB_TX3912) += tx3912fb.o
subdir-$(CONFIG_FB_MATROX) += matrox
ifeq ($(CONFIG_FB_MATROX),y)
@@ -106,6 +113,7 @@
obj-$(CONFIG_FB_HIT) += hitfb.o fbgen.o
obj-$(CONFIG_FB_E1355) += epson1355fb.o fbgen.o
obj-$(CONFIG_FB_PVR2) += pvr2fb.o
+obj-$(CONFIG_FB_VOODOO1) += sstfb.o
obj-$(CONFIG_FB_ANAKIN) += anakinfb.o
obj-$(CONFIG_FB_SIMPLE) += sfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_SED1345) += sed1345fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
@@ -127,3 +135,4 @@
-e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > promcon_tbl.c
promcon_tbl.o: promcon_tbl.c $(TOPDIR)/include/linux/types.h
+
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbmem.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- fbmem.c 2001/10/02 19:39:19 1.49
+++ fbmem.c 2001/10/06 16:11:13 1.50
@@ -650,7 +650,7 @@
pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE|_PAGE_GUARDED;
#elif defined(__alpha__)
/* Caching is off in the I/O space quadrant by design. */
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
if (boot_cpu_data.x86 > 3)
pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
#elif defined(__mips__)
|
