Hook the DRM up to the build and add it to NOTES.

Approved by:	des

14 files changed, 43 insertions, 10 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index b10bd54..6c32fdc 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1087,6 +1087,26 @@ options 	ACPI_DEBUG
 # Optional devices:
 #
 
+# DRM options:
+# gammadrm:  3Dlabs Oxygen GMX 2000
+# mgadrm:    AGP Matrox G200, G400, G450, G550
+# tdfxdrm:   3dfx Voodoo 3/4/5 and Banshee
+# r128drm:   AGP ATI Rage 128
+# radeondrm: AGP ATI Radeon, including 7200 and 7500
+# DRM_LINUX: include linux compatibility, requires COMPAT_LINUX
+# DRM_DEBUG: inlcude debugging code, very slow
+#
+# mga, r128, and radeon require AGP in the kernel
+
+device		gammadrm
+device		mgadrm
+device		"r128drm"
+device		radeondrm
+device		tdfxdrm
+
+options 	DRM_DEBUG
+options 	DRM_LINUX
+
 # 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 b/sys/conf/files
index 030b9af..4367c88 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -311,6 +311,19 @@ dev/digi/Xr.c		optional digi_Xr
 dev/dpt/dpt_eisa.c	optional dpt eisa
 dev/dpt/dpt_pci.c	optional dpt pci
 dev/dpt/dpt_scsi.c	optional dpt
+dev/drm/gamma_dma.c	optional gammadrm
+dev/drm/gamma_drv.c	optional gammadrm
+dev/drm/mga_dma.c	optional mgadrm
+dev/drm/mga_drv.c	optional mgadrm
+dev/drm/mga_state.c	optional mgadrm
+dev/drm/mga_warp.c	optional mgadrm
+dev/drm/r128_cce.c	optional r128drm
+dev/drm/r128_drv.c	optional r128drm
+dev/drm/r128_state.c	optional r128drm
+dev/drm/radeon_cp.c	optional radeondrm
+dev/drm/radeon_drv.c	optional radeondrm
+dev/drm/radeon_state.c	optional radeondrm
+dev/drm/tdfx_drv.c	optional tdfxdrm
 dev/ed/if_ed.c		optional ed
 dev/ed/if_ed_pccard.c	optional ed card
 dev/ed/if_ed_pccard.c	optional ed pccard
diff --git a/sys/conf/options b/sys/conf/options
index f93557dc..55eeecc 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -332,6 +332,10 @@ NETGRAPH_TTY		opt_netgraph.h
 NETGRAPH_UI		opt_netgraph.h
 NETGRAPH_VJC		opt_netgraph.h
 
+# DRM options
+DRM_LINUX		opt_drm.h
+DRM_DEBUG		opt_drm.h
+
 # ATM (HARP version)
 ATM_CORE		opt_atm.h
 ATM_IP			opt_atm.h
diff --git a/sys/dev/drm/gamma_drv.c b/sys/dev/drm/gamma_drv.c
index 7defc26..b94d483 100644
--- a/sys/dev/drm/gamma_drv.c
+++ b/sys/dev/drm/gamma_drv.c
@@ -38,7 +38,6 @@
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <pci/pcivar.h>
-#include <opt_drm_linux.h>
 #endif /* __FreeBSD__ */
 #include "dev/drm/gamma.h"
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c
index 62728a2..d781f6e 100644
--- a/sys/dev/drm/mga_drv.c
+++ b/sys/dev/drm/mga_drv.c
@@ -39,7 +39,6 @@
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <pci/pcivar.h>
-#include <opt_drm_linux.h>
 #endif /* __FreeBSD__ */
 
 #include "dev/drm/mga.h"
diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c
index e6ce5fd..f79237f 100644
--- a/sys/dev/drm/r128_drv.c
+++ b/sys/dev/drm/r128_drv.c
@@ -39,7 +39,6 @@
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <pci/pcivar.h>
-#include <opt_drm_linux.h>
 #endif /* __FreeBSD__ */
 
 #include "dev/drm/r128.h"
diff --git a/sys/dev/drm/radeon_drv.c b/sys/dev/drm/radeon_drv.c
index dc9b083..15a5563 100644
--- a/sys/dev/drm/radeon_drv.c
+++ b/sys/dev/drm/radeon_drv.c
@@ -38,7 +38,6 @@
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <pci/pcivar.h>
-#include <opt_drm_linux.h>
 #endif /* __FreeBSD__ */
 
 #include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx_drv.c
index ecf7db2..359cfc2 100644
--- a/sys/dev/drm/tdfx_drv.c
+++ b/sys/dev/drm/tdfx_drv.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <pci/pcivar.h>
-#include <opt_drm_linux.h>
 #endif /* __FreeBSD__ */
 
 #include "dev/drm/tdfx.h"
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index c174432..1e7bc94 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -21,6 +21,7 @@ SUBDIR=	3dfx \
 	dc \
 	de \
 	digi \
+	drm \
 	dummynet \
 	ed \
 	fdescfs \
diff --git a/sys/modules/drm/gamma/Makefile b/sys/modules/drm/gamma/Makefile
index 4d59022..3931c9d 100644
--- a/sys/modules/drm/gamma/Makefile
+++ b/sys/modules/drm/gamma/Makefile
@@ -4,6 +4,6 @@
 KMOD	= gamma
 NOMAN	= YES
 SRCS    = gamma_drv.c gamma_dma.c
-SRCS   += device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS   += device_if.h bus_if.h pci_if.h opt_drm.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/drm/mga/Makefile b/sys/modules/drm/mga/Makefile
index 55ffa14..8dd95b9 100644
--- a/sys/modules/drm/mga/Makefile
+++ b/sys/modules/drm/mga/Makefile
@@ -4,7 +4,7 @@
 KMOD	= mga
 NOMAN	= YES
 SRCS	= mga_drv.c mga_state.c mga_warp.c mga_dma.c
-SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
 KMODDEPS= agp
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/drm/r128/Makefile b/sys/modules/drm/r128/Makefile
index 947e307..0df5c01 100644
--- a/sys/modules/drm/r128/Makefile
+++ b/sys/modules/drm/r128/Makefile
@@ -4,7 +4,7 @@
 KMOD	= r128
 NOMAN	= YES
 SRCS	= r128_cce.c r128_drv.c r128_state.c
-SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
 KMODDEPS= agp
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/drm/radeon/Makefile b/sys/modules/drm/radeon/Makefile
index 079dc0d..6ff5fb8 100644
--- a/sys/modules/drm/radeon/Makefile
+++ b/sys/modules/drm/radeon/Makefile
@@ -4,7 +4,7 @@
 KMOD	= radeon
 NOMAN	= YES
 SRCS	= radeon_cp.c radeon_drv.c radeon_state.c
-SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
 KMODDEPS= agp
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/drm/tdfx/Makefile b/sys/modules/drm/tdfx/Makefile
index 70bdf56..7012558 100644
--- a/sys/modules/drm/tdfx/Makefile
+++ b/sys/modules/drm/tdfx/Makefile
@@ -4,6 +4,6 @@
 KMOD	= tdfx
 NOMAN	= YES
 SRCS	= tdfx_drv.c
-SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
 
 .include <bsd.kmod.mk>