Menu
▾
▴
linux-mips-commits
|
From: James S. <jsi...@us...> - 2001-10-19 21:19:42
|
Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv13849/drivers/video
Modified Files:
Config.in Makefile epson1356fb.c fbgen2.c fbmem.c maxinefb.c
pmag-ba-fb.c pmagb-b-fb.c
Removed Files:
newport_con.c tx3912fb.c tx3912fb.h
Log Message:
Synced to 2.4.10.
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Config.in 2001/08/25 06:24:45 1.6
+++ Config.in 2001/10/19 21:19:39 1.7
@@ -73,6 +73,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
@@ -101,14 +104,16 @@
bool ' CGsix (GX,TurboGX) support' CONFIG_FB_CGSIX
fi
fi
+ 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
fi
- tristate ' NEC PowerVR 2 display support' CONFIG_FB_PVR2
- dep_bool ' Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
- bool ' MediaQ Framebuffer support' CONFIG_FB_MQ200
+ bool ' MediaQ Framebuffer support' CONFIG_FB_MQ200
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
if [ "$CONFIG_PCI" != "n" ]; then
tristate ' Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX
@@ -129,16 +134,25 @@
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 Rage 128 display support (EXPERIMENTAL)' CONFIG_FB_ATY128
+ tristate ' ATI Radeon display support (EXPERIMENTAL)' CONFIG_FB_RADEON
+ tristate ' ATI Rage128 display support (EXPERIMENTAL)' CONFIG_FB_ATY128
+ tristate ' SIS acceleration (EXPERIMENTAL)' CONFIG_FB_SIS
+ 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
tristate ' 3Dfx Banshee/Voodoo3 display support (EXPERIMENTAL)' CONFIG_FB_3DFX
- tristate ' SIS 630/540 display support (EXPERIMENTAL)' CONFIG_FB_SIS
- fi
- tristate ' Epson SED1356 framebuffer support' CONFIG_FB_E1356
- if [ "$CONFIG_MIPS_PB1000" != "n" -a "$CONFIG_FB_E1356" != "n" ]; then
- bool ' Use CRT on Pb1000 (J65)' CONFIG_PB1000_CRT
- bool ' Use Compsite NTSC on Pb1000 (J63)' CONFIG_PB1000_NTSC
- bool ' Use TFT Panel on Pb1000 (J64)' CONFIG_PB1000_TFT
+ tristate ' 3Dfx Voodoo Graphics (sst1) support (EXPERIMENTAL)' CONFIG_FB_VOODOO1
+ tristate ' Epson SED1356 framebuffer support' CONFIG_FB_E1356
+ if [ "$CONFIG_MIPS_PB1000" != "n" -a "$CONFIG_FB_E1356" != "n" ]; then
+ bool ' Use CRT on Pb1000 (J65)' CONFIG_PB1000_CRT
+ bool ' Use Compsite NTSC on Pb1000 (J63)' CONFIG_PB1000_NTSC
+ bool ' Use TFT Panel on Pb1000 (J64)' CONFIG_PB1000_TFT
+ fi
fi
fi
if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
@@ -257,12 +271,12 @@
"$CONFIG_FB_IGA" = "y" -o "$CONFIG_FB_MATROX" = "y" -o \
"$CONFIG_FB_CT65550" = "y" -o "$CONFIG_FB_PM2" = "y" -o \
"$CONFIG_FB_P9100" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
- "$CONFIG_FB_RIVA" = "y" -o \
+ "$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_RADEON" = "y" -o \
"$CONFIG_FB_SGIVW" = "y" -o "$CONFIG_FB_CYBER2000" = "y" -o \
"$CONFIG_FB_SA1100" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \
"$CONFIG_FB_PMAG_BA" = "y" -o "$CONFIG_FB_PMAGB_B" = "y" -o \
- "$CONFIG_FB_MAXINE" = "y" -o "$CONFIG_FB_MQ200" = "y" -o \
- "$CONFIG_FB_TX3912" = "y" -o "$CONFIG_FB_SIS" = "y" ]; then
+ "$CONFIG_FB_MAXINE" = "y" -o "$CONFIG_FB_TX3912" = "y" -o \
+ "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_MQ200" = "y" ]; then
define_tristate CONFIG_FBCON_CFB8 y
else
if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_ATARI" = "m" -o \
@@ -279,17 +293,17 @@
"$CONFIG_FB_P9100" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_3DFX" = "m" -o \
"$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_CYBER2000" = "m" -o \
- "$CONFIG_FB_PMAG_BA" = "m" -o "CONFIG_FB_PMAGB_B" = "m" -o \
- "$CONFIG_FB_MAXINE" = "m" -o "$CONFIG_FB_MQ200" = "y" -o \
- "$CONFIG_FB_TX3912" = "m" -o \
- "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" ]; then
+ "$CONFIG_FB_PMAG_BA" = "m" -o "$CONFIG_FB_PMAGB_B" = "m" -o \
+ "$CONFIG_FB_MAXINE" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
+ "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
+ "$CONFIG_FB_TX3912" = "m" "$CONFIG_FB_MQ200" = "m" ]; then
define_tristate CONFIG_FBCON_CFB8 m
fi
fi
if [ "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_ATY" = "y" -o \
"$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_VESA" = "y" -o \
"$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_TBOX" = "y" -o \
- "$CONFIG_FB_Q40" = "y" -o "$CONFIG_FB_MQ200" = "y" -o \
+ "$CONFIG_FB_Q40" = "y" -o "$CONFIG_FB_RADEON" = "y" -o \
"$CONFIG_FB_CONTROL" = "y" -o "$CONFIG_FB_CLGEN" = "y" -o \
"$CONFIG_FB_VIRGE" = "y" -o "$CONFIG_FB_CYBER" = "y" -o \
"$CONFIG_FB_VALKYRIE" = "y" -o "$CONFIG_FB_PLATINUM" = "y" -o \
@@ -298,7 +312,8 @@
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \
"$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SA1100" = "y" -o \
- "$CONFIG_FB_PVR2" = "y" ]; then
+ "$CONFIG_FB_PVR2" = "y" -o "$CONFIG_FB_VOODOO1" = "y" -o \
+ "$CONFIG_FB_MQ200" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 y
else
if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \
@@ -312,23 +327,26 @@
"$CONFIG_FB_PM2" = "m" -o "$CONFIG_FB_SGIVW" = "m" -o \
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
- "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_PVR2" = "m" -o \
- "$CONFIG_FB_MQ200" = "y" ]; then
+ "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
+ "$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_VOODOO1" = "m" -o \
+ "$CONFIG_FB_MQ200" = "m" ]; then
define_tristate CONFIG_FBCON_CFB16 m
fi
fi
if [ "$CONFIG_FB_ATY" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" -o \
"$CONFIG_FB_CLGEN" = "y" -o "$CONFIG_FB_VESA" = "y" -o \
"$CONFIG_FB_MATROX" = "y" -o "$CONFIG_FB_PM2" = "y" -o \
- "$CONFIG_FB_ATY128" = "y" -o \
- "$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_PVR2" = "y" ]; then
+ "$CONFIG_FB_ATY128" = "y" -o "$CONFIG_FB_RADEON" = "y" -o \
+ "$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_PVR2" = "y" -o \
+ "$CONFIG_FB_VOODOO1" = "y" ]; then
define_tristate CONFIG_FBCON_CFB24 y
else
if [ "$CONFIG_FB_ATY" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" -o \
"$CONFIG_FB_CLGEN" = "m" -o "$CONFIG_FB_VESA" = "m" -o \
"$CONFIG_FB_MATROX" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
- "$CONFIG_FB_ATY128" = "m" -o \
- "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_PVR2" = "m" ]; then
+ "$CONFIG_FB_ATY128" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
+ "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_PVR2" = "m" -o \
+ "$CONFIG_FB_VOODOO1" = "m" ]; then
define_tristate CONFIG_FBCON_CFB24 m
fi
fi
@@ -339,8 +357,9 @@
"$CONFIG_FB_MATROX" = "y" -o "$CONFIG_FB_PM2" = "y" -o \
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_FM2" = "y" -o "$CONFIG_FB_SGIVW" = "y" -o \
+ "$CONFIG_FB_RADEON" = "y" -o "$CONFIG_FB_PVR2" = "y" -o \
"$CONFIG_FB_3DFX" = "y" -o "$CONFIG_FB_SIS" = "y" -o \
- "$CONFIG_FB_PVR2" = "y" ]; then
+ "$CONFIG_FB_VOODOO1" = "y" ]; then
define_tristate CONFIG_FBCON_CFB32 y
else
if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \
@@ -349,9 +368,9 @@
"$CONFIG_FB_TGA" = "m" -o "$CONFIG_FB_PLATINUM" = "m" -o \
"$CONFIG_FB_MATROX" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
- "$CONFIG_FB_3DFX" = "m" -o \
+ "$CONFIG_FB_3DFX" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
"$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
- "$CONFIG_FB_PVR2" = "m" ]; then
+ "$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_VOODOO1" = "m" ]; then
define_tristate CONFIG_FBCON_CFB32 m
fi
fi
@@ -397,6 +416,9 @@
if [ "$CONFIG_FB_HGA" = "m" ]; then
define_tristate CONFIG_FBCON_HGA m
fi
+ fi
+ if [ "$CONFIG_FB_STI" = "y" ]; then
+ define_tristate CONFIG_FBCON_STI y
fi
fi
bool ' Support only 8 pixels wide fonts' CONFIG_FBCON_FONTWIDTH8_ONLY
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 2001/08/25 06:24:45 1.5
+++ Makefile 2001/10/19 21:19:39 1.6
@@ -22,6 +22,7 @@
obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o
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
obj-$(CONFIG_MDA_CONSOLE) += mdacon.o
@@ -47,6 +48,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
@@ -77,6 +79,7 @@
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
@@ -112,6 +115,7 @@
obj-$(CONFIG_FB_E1355) += epson1355fb.o fbgen.o
obj-$(CONFIG_FB_E1356) += epson1356fb.o
obj-$(CONFIG_FB_PVR2) += pvr2fb.o
+obj-$(CONFIG_FB_VOODOO1) += sstfb.o
# Generic Low Level Drivers
@@ -131,6 +135,7 @@
obj-$(CONFIG_FBCON_MFB) += fbcon-mfb.o
obj-$(CONFIG_FBCON_VGA) += fbcon-vga.o
obj-$(CONFIG_FBCON_HGA) += fbcon-hga.o
+obj-$(CONFIG_FBCON_STI) += fbcon-sti.o
include $(TOPDIR)/Rules.make
Index: epson1356fb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/epson1356fb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- epson1356fb.c 2001/10/10 19:21:06 1.6
+++ epson1356fb.c 2001/10/19 21:19:39 1.7
@@ -40,7 +40,7 @@
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/tty.h>
-#include <linux/slab.h>
+#include <linux/malloc.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
Index: fbgen2.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbgen2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fbgen2.c 2001/06/29 21:31:00 1.1
+++ fbgen2.c 2001/10/19 21:19:39 1.2
@@ -15,7 +15,7 @@
#include <linux/string.h>
#include <linux/tty.h>
#include <linux/fb.h>
-#include <linux/slab.h>
+#include <linux/malloc.h>
#include <asm/uaccess.h>
#include <asm/io.h>
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fbmem.c 2001/09/25 03:36:35 1.7
+++ fbmem.c 2001/10/19 21:19:39 1.8
@@ -20,7 +20,7 @@
#include <linux/smp_lock.h>
#include <linux/kernel.h>
#include <linux/major.h>
-#include <linux/slab.h>
+#include <linux/malloc.h>
#include <linux/mman.h>
#include <linux/tty.h>
#include <linux/console.h>
@@ -281,6 +281,9 @@
#ifdef CONFIG_FB_TX3912
{ "tx3912", tx3912fb_init, NULL },
#endif
+#ifdef CONFIG_FB_TX3912
+ { "tx3912", tx3912fb_init, NULL },
+#endif
#ifdef CONFIG_FB_E1355
{ "e1355fb", e1355fb_init, e1355fb_setup },
#endif
@@ -322,6 +325,18 @@
#endif
+#ifdef CONFIG_FB_PMAG_BA
+ { "pmagbafb", pmagbafb_init, pmagbafb_setup },
+#endif
+#ifdef CONFIG_FB_PMAGB_B
+ { "pmagbbfb", pmagbbfb_init, pmagbbfb_setup },
+#endif
+
+#ifdef CONFIG_FB_MAXINE
+ { "maxinefb", maxinefb_init, maxinefb_setup },
+#endif
+
+
#ifdef CONFIG_FB_VIRTUAL
/*
* Vfb must be last to avoid that it becomes your primary display if
@@ -624,7 +639,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(__arm__) || defined(__mips__)
Index: maxinefb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/maxinefb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maxinefb.c 2001/09/28 16:27:59 1.2
+++ maxinefb.c 2001/10/19 21:19:39 1.3
@@ -382,6 +382,7 @@
}
#ifdef MODULE
+MODULE_LICENSE("GPL");
module_init(maxinefb_init);
#endif
module_exit(maxinefb_exit);
Index: pmag-ba-fb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/pmag-ba-fb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pmag-ba-fb.c 2001/09/28 16:27:59 1.4
+++ pmag-ba-fb.c 2001/10/19 21:19:39 1.5
@@ -27,7 +27,7 @@
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/tty.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/fb.h>
@@ -424,3 +424,5 @@
return -ENODEV;
}
}
+
+MODULE_LICENSE("GPL");
Index: pmagb-b-fb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/pmagb-b-fb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pmagb-b-fb.c 2001/09/28 16:27:59 1.4
+++ pmagb-b-fb.c 2001/10/19 21:19:39 1.5
@@ -30,7 +30,7 @@
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/tty.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/fb.h>
@@ -427,3 +427,5 @@
return -ENODEV;
}
}
+
+MODULE_LICENSE("GPL");
--- newport_con.c DELETED ---
--- tx3912fb.c DELETED ---
--- tx3912fb.h DELETED ---
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X