PERFORCE change 71345 for review

[Eric Anholt]

http://perforce.freebsd.org/chv.cgi?CH=71345

Change 71345 by anholt at anholt_leguin on 2005/02/19 21:50:03

	Update kernel build infrastructure for new DRM.  Untested.

Affected files ...

.. //depot/projects/drm-merge/sys/amd64/conf/NOTES#2 edit
.. //depot/projects/drm-merge/sys/conf/files#2 edit
.. //depot/projects/drm-merge/sys/i386/conf/NOTES#2 edit

Differences ...

==== //depot/projects/drm-merge/sys/amd64/conf/NOTES#2 (text+ko) ====

@@ -208,24 +208,14 @@
 # Support for ACPI CPU Performance states via cpufreq(4)
 device		acpi_perf
 
-# 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
+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)
 
 #
 # Network interfaces:

==== //depot/projects/drm-merge/sys/conf/files#2 (text+ko) ====

@@ -448,6 +448,26 @@
 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/ati_pcigart.c		optional drm
+dev/drm/drm_agpsupport.c	optional drm
+dev/drm/drm_auth.c		optional drm
+dev/drm/drm_bufs.c		optional drm
+dev/drm/drm_context.c		optional drm
+dev/drm/drm_dma.c		optional drm
+dev/drm/drm_drawable.c		optional drm
+dev/drm/drm_drv.c		optional drm
+dev/drm/drm_fops.c		optional drm
+dev/drm/drm_ioctl.c		optional drm
+dev/drm/drm_irq.c		optional drm
+dev/drm/drm_lock.c		optional drm
+dev/drm/drm_memory.c		optional drm
+dev/drm/drm_pci.c		optional drm
+dev/drm/drm_scatter.c		optional drm
+dev/drm/drm_sysctl.c		optional drm
+dev/drm/mach64_dma.c		optional mach64drm
+dev/drm/mach64_drv.c		optional mach64drm
+dev/drm/mach64_irq.c		optional mach64drm
+dev/drm/mach64_state.c		optional mach64drm
 dev/drm/mga_dma.c		optional mgadrm
 dev/drm/mga_drv.c		optional mgadrm
 dev/drm/mga_irq.c		optional mgadrm

==== //depot/projects/drm-merge/sys/i386/conf/NOTES#2 (text+ko) ====

@@ -463,24 +463,15 @@
 # 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