From 372c73375922be670fced0fce1b20ecf742469a3 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 21 Sep 2009 07:05:48 +0000
Subject: [PATCH] Enable s3pci on amd64 which works on top of VESA, and allow
 static building it into kernel on i386 and amd64.

Submitted by:	swell.k at gmail.com
---
 sys/amd64/conf/NOTES | 3 +++
 sys/conf/files.amd64 | 1 +
 sys/conf/files.i386  | 1 +
 sys/dev/fb/s3_pci.c  | 1 -
 sys/i386/conf/NOTES  | 3 +++
 sys/modules/Makefile | 1 +
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index ada5e32c0bbc..c911593c2af0 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -219,6 +219,9 @@ options 	VGA_WIDTH90		# support 90 column modes
 # Debugging.
 options 	VGA_DEBUG
 
+# Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA.
+device		s3pci
+
 # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support.  This will create
 # the /dev/3dfx0 device to work with glide implementations.  This should get
 # linked to /dev/3dfx and /dev/voodoo.  Note that this is not the same as
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 01f535592829..872ee4dc9b4f 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -170,6 +170,7 @@ dev/ed/if_ed_wd80x3.c		optional	ed isa
 dev/ed/if_ed_hpp.c		optional	ed isa ed_hpp
 dev/ed/if_ed_sic.c		optional	ed isa ed_sic
 dev/fb/fb.c			optional	fb | vga
+dev/fb/s3_pci.c			optional	s3pci
 dev/fb/vesa.c			optional	vga vesa x86emu
 dev/fb/vga.c			optional	vga
 dev/ichwd/ichwd.c		optional	ichwd
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 0a16ceed9783..ba8d9132d7a1 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -157,6 +157,7 @@ dev/ed/if_ed_wd80x3.c		optional ed isa
 dev/ed/if_ed_hpp.c		optional ed isa ed_hpp
 dev/ed/if_ed_sic.c		optional ed isa ed_sic
 dev/fb/fb.c			optional fb | vga
+dev/fb/s3_pci.c			optional s3pci
 dev/fb/vesa.c			optional vga vesa x86emu
 dev/fb/vga.c			optional vga
 dev/fdc/fdc.c			optional fdc
diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 45facc9efe2e..cfddf3041f09 100644
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 
 #include <machine/md_var.h>
-#include <machine/vm86.h>
 #include <machine/pc/bios.h>
 #include <dev/fb/vesa.h>
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 876224e7788c..001b3414ea82 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -444,6 +444,9 @@ options 	VGA_WIDTH90		# support 90 column modes
 # Debugging.
 options 	VGA_DEBUG
 
+# Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA.
+device		s3pci
+
 # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support.  This will create
 # the /dev/3dfx0 device to work with glide implementations.  This should get
 # linked to /dev/3dfx and /dev/voodoo.  Note that this is not the same as
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 8f37b61954f4..c07dea82a2d1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -528,6 +528,7 @@ _padlock=	padlock
 .endif
 _pccard=	pccard
 _rdma=		rdma	
+_s3=		s3
 _safe=		safe
 _scsi_low=	scsi_low
 _smbfs=		smbfs