aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2003-09-09 00:29:02 +0000
committerEric Anholt <anholt@FreeBSD.org>2003-09-09 00:29:02 +0000
commita1810e1513f5b4210742e761c239a113ada81126 (patch)
tree78f2adef54da9bf0c42b64bb887cc94d84ac97ca /sys
parent6608b729ea4c680e54b3ab724a67512ef7dd4ca8 (diff)
downloadsrc-a1810e1513f5b4210742e761c239a113ada81126.tar.gz
src-a1810e1513f5b4210742e761c239a113ada81126.zip
Hook the SiS DRM up to the build
Sponsored by: LinuxFund
Notes
Notes: svn path=/head/; revision=119896
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files3
-rw-r--r--sys/i386/conf/NOTES4
-rw-r--r--sys/modules/drm/Makefile2
-rw-r--r--sys/modules/drm/sis/Makefile9
4 files changed, 16 insertions, 2 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 72e96c8b1380..adf18b063e9d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -376,6 +376,9 @@ dev/drm/radeon_drv.c optional radeondrm
dev/drm/radeon_irq.c optional radeondrm
dev/drm/radeon_mem.c optional radeondrm
dev/drm/radeon_state.c optional radeondrm
+dev/drm/sis_drv.c optional sisdrm
+dev/drm/sis_ds.c optional sisdrm
+dev/drm/sis_mm.c optional sisdrm
dev/drm/tdfx_drv.c optional tdfxdrm
dev/ed/if_ed.c optional ed
dev/ed/if_ed_pccard.c optional ed card
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index c94c84d82123..d7737aeb660e 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -418,9 +418,10 @@ options ACPI_DEBUG
# DRM options:
# mgadrm: AGP Matrox G200, G400, G450, G550
-# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee
# r128drm: ATI Rage 128
# radeondrm: ATI Radeon up to 9000/9100
+# sisdrm: SiS 300/305,540,630
+# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee
# DRM_DEBUG: include debug printfs, very slow
#
# mga requires AGP in the kernel, and it is recommended
@@ -429,6 +430,7 @@ options ACPI_DEBUG
device mgadrm
device "r128drm"
device radeondrm
+device sisdrm
device tdfxdrm
options DRM_DEBUG
diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile
index 665799492371..b496fa94d5cf 100644
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR = mga r128 radeon tdfx
+SUBDIR = mga r128 radeon sis tdfx
.include <bsd.subdir.mk>
diff --git a/sys/modules/drm/sis/Makefile b/sys/modules/drm/sis/Makefile
new file mode 100644
index 000000000000..cbbfad280625
--- /dev/null
+++ b/sys/modules/drm/sis/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../dev/drm
+KMOD= sis
+NOMAN= YES
+SRCS= sis_drv.c sis_ds.c sis_mm.c
+SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h
+
+.include <bsd.kmod.mk>