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

1 files changed, 9 insertions, 18 deletions

diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 4431671..3da74fd 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -452,24 +452,15 @@ device		acpi_video
 # The cpufreq(4) driver provides support for non-ACPI CPU frequency control
 device		cpufreq
 
-# DRM options:
-# mgadrm:    AGP Matrox G200, G400, G450, G550
-# 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
-# for AGP r128 and radeon cards.
-
-device		mgadrm
-device		r128drm
-device		radeondrm
-device		sisdrm
-device		tdfxdrm
-
-options 	DRM_DEBUG
+# Direct Rendering modules for 3D acceleration.
+device		drm		# DRM core module required by DRM drivers
+device		mach64drm	# ATI Rage Pro, Rage Mobility P/M, Rage XL
+device		mgadrm		# AGP Matrox G200, G400, G450, G550
+device		r128drm		# ATI Rage 128
+device		radeondrm	# ATI Radeon up to 9200
+device		sisdrm		# SiS 300/305, 540, 630
+device		tdfxdrm		# 3dfx Voodoo 3/4/5 and Banshee
+options 	DRM_DEBUG	# Include debug printfs (slow)
 
 #
 # mse: Logitech and ATI InPort bus mouse ports