Module Name: src
Committed By: mrg
Date: Sun Jun 21 20:15:27 UTC 2009
Modified Files:
src/sys/conf: files
src/sys/dev/pci: files.pci
Added Files:
src/sys/external/bsd/drm/conf: files.drm
Log Message:
make external drm the default.
To generate a diff of this commit:
cvs rdiff -u -r1.948 -r1.949 src/sys/conf/files
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/pci/files.pci
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm/conf/files.drm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.948 src/sys/conf/files:1.949
--- src/sys/conf/files:1.948 Wed Jun 17 04:02:59 2009
+++ src/sys/conf/files Sun Jun 21 20:15:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.948 2009/06/17 04:02:59 jakllsch Exp $
+# $NetBSD: files,v 1.949 2009/06/21 20:15:26 mrg Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20090313
@@ -1026,7 +1026,7 @@
# DRM - Direct Rendering Infrastructure: dev/drm
define drm {}
-include dev/drm/files.drm
+include "external/bsd/drm/conf/files.drm"
# Definitions for wscons
# device attributes: display, display with emulator, keyboard, and mouse
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.315 src/sys/dev/pci/files.pci:1.316
--- src/sys/dev/pci/files.pci:1.315 Wed Jun 17 04:37:57 2009
+++ src/sys/dev/pci/files.pci Sun Jun 21 20:15:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.315 2009/06/17 04:37:57 jakllsch Exp $
+# $NetBSD: files.pci,v 1.316 2009/06/21 20:15:26 mrg Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -913,11 +913,6 @@
attach sdhc at pci with sdhc_pci
file dev/pci/sdhc_pci.c sdhc_pci
-#
-# Direct Rendering Manager
-#
-include "dev/pci/drm/files.pcidrm"
-
# generic framebuffer console driver, PCI frontend
attach genfb at pci with genfb_pci
file dev/pci/genfb_pci.c genfb_pci
Added files:
Index: src/sys/external/bsd/drm/conf/files.drm
diff -u /dev/null src/sys/external/bsd/drm/conf/files.drm:1.1
--- /dev/null Sun Jun 21 20:15:27 2009
+++ src/sys/external/bsd/drm/conf/files.drm Sun Jun 21 20:15:26 2009
@@ -0,0 +1,96 @@
+# $NetBSD: files.drm,v 1.1 2009/06/21 20:15:26 mrg Exp $
+
+# direct rendering modules
+define drmbase
+define drmpci
+
+defflag opt_drm.h DRM_DEBUG DRM_NO_AGP DRM_NO_MTRR
+
+makeoptions drmbase CPPFLAGS+="-I$S/external/bsd/drm/dist/bsd-core -I$S/external/bsd/drm/dist/shared-core"
+
+file external/bsd/drm/dist/bsd-core/drm_agpsupport.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_auth.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_bufs.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_context.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_dma.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_drawable.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_drv.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_fops.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_ioctl.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_irq.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_lock.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_memory.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_pci.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_scatter.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_sysctl.c drmbase
+file external/bsd/drm/dist/bsd-core/drm_vm.c drmbase
+
+device i915drm: drmbase, drmpci
+attach i915drm at drm
+file external/bsd/drm/dist/bsd-core/i915_drv.c i915drm
+file external/bsd/drm/dist/shared-core/i915_dma.c i915drm
+file external/bsd/drm/dist/shared-core/i915_irq.c i915drm
+file external/bsd/drm/dist/shared-core/i915_mem.c i915drm
+file external/bsd/drm/dist/shared-core/i915_suspend.c i915drm
+
+device mach64drm: drmbase, drmpci
+attach mach64drm at drm
+file external/bsd/drm/dist/bsd-core/mach64_drv.c mach64drm
+file external/bsd/drm/dist/shared-core/mach64_dma.c mach64drm
+file external/bsd/drm/dist/shared-core/mach64_irq.c mach64drm
+file external/bsd/drm/dist/shared-core/mach64_state.c mach64drm
+
+device mgadrm: drmbase, drmpci
+attach mgadrm at drm
+file external/bsd/drm/dist/bsd-core/mga_drv.c mgadrm
+file external/bsd/drm/dist/shared-core/mga_dma.c mgadrm
+file external/bsd/drm/dist/shared-core/mga_irq.c mgadrm
+file external/bsd/drm/dist/shared-core/mga_state.c mgadrm
+file external/bsd/drm/dist/shared-core/mga_warp.c mgadrm
+
+# XXX missing: nouveau, nv
+
+device r128drm: drmbase, drmpci
+attach r128drm at drm
+file external/bsd/drm/dist/bsd-core/ati_pcigart.c (r128drm | radeondrm)
+file external/bsd/drm/dist/bsd-core/r128_drv.c r128drm
+file external/bsd/drm/dist/shared-core/r128_cce.c r128drm
+file external/bsd/drm/dist/shared-core/r128_irq.c r128drm
+file external/bsd/drm/dist/shared-core/r128_state.c r128drm
+
+device radeondrm: drmbase, drmpci
+attach radeondrm at drm
+file external/bsd/drm/dist/bsd-core/radeon_drv.c radeondrm
+file external/bsd/drm/dist/shared-core/r300_cmdbuf.c radeondrm
+file external/bsd/drm/dist/shared-core/r600_cp.c radeondrm
+file external/bsd/drm/dist/shared-core/radeon_cp.c radeondrm
+file external/bsd/drm/dist/shared-core/radeon_irq.c radeondrm
+file external/bsd/drm/dist/shared-core/radeon_mem.c radeondrm
+file external/bsd/drm/dist/shared-core/radeon_state.c radeondrm
+
+device savagedrm: drmbase, drmpci
+attach savagedrm at drm
+file external/bsd/drm/dist/bsd-core/savage_drv.c savagedrm
+file external/bsd/drm/dist/shared-core/savage_bci.c savagedrm
+file external/bsd/drm/dist/shared-core/savage_state.c savagedrm
+
+device sisdrm: drmbase, drmpci
+attach sisdrm at drm
+file external/bsd/drm/dist/bsd-core/sis_drv.c sisdrm
+file external/bsd/drm/dist/shared-core/sis_ds.c sisdrm
+file external/bsd/drm/dist/shared-core/sis_mm.c sisdrm
+
+device tdfxdrm: drmbase, drmpci
+attach tdfxdrm at drm
+file external/bsd/drm/dist/bsd-core/tdfx_drv.c tdfxdrm
+
+device viadrm: drmbase, drmpci
+attach viadrm at drm
+file external/bsd/drm/dist/bsd-core/via_drv.c viadrm
+file external/bsd/drm/dist/shared-core/via_dma.c viadrm
+file external/bsd/drm/dist/shared-core/via_ds.c viadrm
+file external/bsd/drm/dist/shared-core/via_irq.c viadrm
+file external/bsd/drm/dist/shared-core/via_map.c viadrm
+file external/bsd/drm/dist/shared-core/via_mm.c viadrm
+file external/bsd/drm/dist/shared-core/via_verifier.c viadrm
+file external/bsd/drm/dist/shared-core/via_video.c viadrm
