Update to DRM CVS as of 2005-04-12, bringing many changes:

- Split core DRM routines back into their own module, rather than using the
  nasty templated system like before.
- Development-class R300 support in radeon driver (requires userland pieces, of
  course).
- Mach64 driver (haven't tested in a while -- my mach64s no longer fit in the
  testbox).  Covers Rage Pros, Rage Mobility P/M, Rage XL, and some others.
- i915 driver files, which just need to get drm_drv.c fixed to allow attachment
  to the drmsub device.  Covers i830 through i915 integrated graphics.
- savage driver files, which should require minimal changes to work.  Covers the
  Savage3D, Savage IX/MX, Savage 4, ProSavage.
- Support for color and texture tiling and HyperZ features of Radeon.

Thanks to:	scottl (much p4 handholding)
		Jung-uk Kim (helpful prodding)
PR:		[1] kern/76879, [2] kern/72548
Submitted by:	[1] Alex, lesha at intercaf dot ru
		[2] Shaun Jurrens, shaun at shamz dot net

3 files changed, 42 insertions, 1 deletions

diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile
index b496fa9..6a8bd8e 100644
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -1,5 +1,12 @@
 # $FreeBSD$
 
-SUBDIR = mga r128 radeon sis tdfx
+SUBDIR = \
+	drm \
+	mach64 \
+	mga \
+	r128 \
+	radeon \
+	sis \
+	tdfx
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/drm/drm/Makefile b/sys/modules/drm/drm/Makefile
new file mode 100644
index 0000000..faa3009
--- /dev/null
+++ b/sys/modules/drm/drm/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../../dev/drm
+KMOD	= drm
+SRCS	= \
+	ati_pcigart.c \
+	drm_agpsupport.c \
+	drm_auth.c \
+	drm_bufs.c \
+	drm_context.c \
+	drm_dma.c \
+	drm_drawable.c \
+	drm_drv.c \
+	drm_fops.c \
+	drm_ioctl.c \
+	drm_irq.c \
+	drm_lock.c \
+	drm_memory.c \
+	drm_pci.c \
+	drm_scatter.c \
+	drm_sysctl.c \
+	drm_vm.c
+
+SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/drm/mach64/Makefile b/sys/modules/drm/mach64/Makefile
new file mode 100644
index 0000000..4d5069c
--- /dev/null
+++ b/sys/modules/drm/mach64/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../../dev/drm
+KMOD	= mach64
+SRCS	= mach64_dma.c mach64_drv.c mach64_irq.c mach64_state.c
+SRCS	+=device_if.h bus_if.h pci_if.h opt_drm.h
+
+.include <bsd.kmod.mk>