Module Name: src
Committed By: snj
Date: Tue Jun 23 07:01:42 UTC 2009
Modified Files:
src/sys/dev/drm [netbsd-5]: files.drm
src/sys/dev/pci/drm [netbsd-5]: files.pcidrm
Log Message:
Apply patch (requested by mrg in ticket #827):
Default to the new drm code.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/dev/drm/files.drm
cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/dev/pci/drm/files.pcidrm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/drm/files.drm
diff -u src/sys/dev/drm/files.drm:1.6 src/sys/dev/drm/files.drm:1.6.4.1
--- src/sys/dev/drm/files.drm:1.6 Sat Jul 19 07:26:54 2008
+++ src/sys/dev/drm/files.drm Tue Jun 23 07:01:41 2009
@@ -1,46 +1,44 @@
-# $NetBSD: files.drm,v 1.6 2008/07/19 07:26:54 mrg Exp $
+# $NetBSD: files.drm,v 1.6.4.1 2009/06/23 07:01:41 snj Exp $
# direct rendering modules
define drmbase
defflag opt_drm.h DRM_DEBUG DRM_NO_AGP DRM_NO_MTRR
-file dev/drm/drm_agpsupport.c drmbase & !drm_external
-file dev/drm/drm_auth.c drmbase & !drm_external
-file dev/drm/drm_bufs.c drmbase & !drm_external
-file dev/drm/drm_context.c drmbase & !drm_external
-file dev/drm/drm_dma.c drmbase & !drm_external
-file dev/drm/drm_drawable.c drmbase & !drm_external
-file dev/drm/drm_drv.c drmbase & !drm_external
-file dev/drm/drm_fops.c drmbase & !drm_external
-file dev/drm/drm_ioctl.c drmbase & !drm_external
-file dev/drm/drm_irq.c drmbase & !drm_external
-file dev/drm/drm_lock.c drmbase & !drm_external
-file dev/drm/drm_memory.c drmbase & !drm_external
-file dev/drm/drm_pci.c drmbase & !drm_external
-file dev/drm/drm_scatter.c drmbase & !drm_external
-file dev/drm/drm_sysctl.c drmbase & !drm_external
-file dev/drm/drm_vm.c drmbase & !drm_external
+file dev/drm/drm_agpsupport.c drmbase & drm_noexternal
+file dev/drm/drm_auth.c drmbase & drm_noexternal
+file dev/drm/drm_bufs.c drmbase & drm_noexternal
+file dev/drm/drm_context.c drmbase & drm_noexternal
+file dev/drm/drm_dma.c drmbase & drm_noexternal
+file dev/drm/drm_drawable.c drmbase & drm_noexternal
+file dev/drm/drm_drv.c drmbase & drm_noexternal
+file dev/drm/drm_fops.c drmbase & drm_noexternal
+file dev/drm/drm_ioctl.c drmbase & drm_noexternal
+file dev/drm/drm_irq.c drmbase & drm_noexternal
+file dev/drm/drm_lock.c drmbase & drm_noexternal
+file dev/drm/drm_memory.c drmbase & drm_noexternal
+file dev/drm/drm_pci.c drmbase & drm_noexternal
+file dev/drm/drm_scatter.c drmbase & drm_noexternal
+file dev/drm/drm_sysctl.c drmbase & drm_noexternal
+file dev/drm/drm_vm.c drmbase & drm_noexternal
-file external/bsd/drm/dist/bsd-core/drm_agpsupport.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_auth.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_bufs.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_context.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_dma.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_drawable.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_drv.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_fops.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_ioctl.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_irq.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_lock.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_memory.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_pci.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_scatter.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_sysctl.c drmbase & drm_external
-file external/bsd/drm/dist/bsd-core/drm_vm.c drmbase & drm_external
+file external/bsd/drm/dist/bsd-core/drm_agpsupport.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_auth.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_bufs.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_context.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_dma.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_drawable.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_drv.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_fops.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_ioctl.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_irq.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_lock.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_memory.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_pci.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_scatter.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_sysctl.c drmbase & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/drm_vm.c drmbase & !drm_noexternal
-makeoptions drmbase CPPFLAGS+="-I$S/dev/drm"
-
-# XXXMRG want to use the first two, but the second two work.
-#makeoptions drmbase & !drm_external CPPFLAGS+="-I$S/dev/drm"
-#makeoptions drmbase & drm_external CPPFLAGS+="-I$S/external/bsd/drm/dist/bsd-core -I$S/external/bsd/drm/dist/shared-core"
-#makeoptions drm_noexternal CPPFLAGS+="-I$S/dev/drm"
-#makeoptions drm_external CPPFLAGS+="-I$S/external/bsd/drm/dist/bsd-core -I$S/external/bsd/drm/dist/shared-core"
+# XXX only one of these lines can be active. to use old drm please
+# XXX comment the first line and uncomment the second, and also see
+# XXX the line to uncomment in sys/dev/pci/drm/files.pcidrm
+makeoptions drmbase CPPFLAGS+="-I$S/external/bsd/drm/dist/bsd-core -I$S/external/bsd/drm/dist/shared-core"
+#makeoptions drmbase CPPFLAGS+="-I$S/dev/drm"
Index: src/sys/dev/pci/drm/files.pcidrm
diff -u src/sys/dev/pci/drm/files.pcidrm:1.3 src/sys/dev/pci/drm/files.pcidrm:1.3.4.1
--- src/sys/dev/pci/drm/files.pcidrm:1.3 Sat Jul 19 07:26:54 2008
+++ src/sys/dev/pci/drm/files.pcidrm Tue Jun 23 07:01:41 2009
@@ -1,127 +1,124 @@
-# $NetBSD: files.pcidrm,v 1.3 2008/07/19 07:26:54 mrg Exp $
+# $NetBSD: files.pcidrm,v 1.3.4.1 2009/06/23 07:01:41 snj Exp $
define drmpci
device i915drm: drmbase, drmpci
attach i915drm at drm
-file dev/pci/drm/i915_drv.c i915drm & !drm_external
-file dev/pci/drm/i915_dma.c i915drm & !drm_external
-file dev/pci/drm/i915_irq.c i915drm & !drm_external
-file dev/pci/drm/i915_mem.c i915drm & !drm_external
-
-file external/bsd/drm/dist/bsd-core/i915_drv.c i915drm & drm_external
-file external/bsd/drm/dist/shared-core/i915_dma.c i915drm & drm_external
-file external/bsd/drm/dist/shared-core/i915_irq.c i915drm & drm_external
-file external/bsd/drm/dist/shared-core/i915_mem.c i915drm & drm_external
-file external/bsd/drm/dist/shared-core/i915_suspend.c i915drm & drm_external
+file dev/pci/drm/i915_drv.c i915drm & drm_noexternal
+file dev/pci/drm/i915_dma.c i915drm & drm_noexternal
+file dev/pci/drm/i915_irq.c i915drm & drm_noexternal
+file dev/pci/drm/i915_mem.c i915drm & drm_noexternal
+
+file external/bsd/drm/dist/bsd-core/i915_drv.c i915drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/i915_dma.c i915drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/i915_irq.c i915drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/i915_mem.c i915drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/i915_suspend.c i915drm & !drm_noexternal
device mach64drm: drmbase, drmpci
attach mach64drm at drm
-file dev/pci/drm/mach64_dma.c mach64drm & !drm_external
-file dev/pci/drm/mach64_drv.c mach64drm & !drm_external
-file dev/pci/drm/mach64_irq.c mach64drm & !drm_external
-file dev/pci/drm/mach64_state.c mach64drm & !drm_external
-
-file external/bsd/drm/dist/bsd-core/mach64_drv.c mach64drm & drm_external
-file external/bsd/drm/dist/shared-core/mach64_dma.c mach64drm & drm_external
-file external/bsd/drm/dist/shared-core/mach64_irq.c mach64drm & drm_external
-file external/bsd/drm/dist/shared-core/mach64_state.c mach64drm & drm_external
+file dev/pci/drm/mach64_dma.c mach64drm & drm_noexternal
+file dev/pci/drm/mach64_drv.c mach64drm & drm_noexternal
+file dev/pci/drm/mach64_irq.c mach64drm & drm_noexternal
+file dev/pci/drm/mach64_state.c mach64drm & drm_noexternal
+
+file external/bsd/drm/dist/bsd-core/mach64_drv.c mach64drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/mach64_dma.c mach64drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/mach64_irq.c mach64drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/mach64_state.c mach64drm & !drm_noexternal
device mgadrm: drmbase, drmpci
attach mgadrm at drm
-file dev/pci/drm/mga_dma.c mgadrm & !drm_external
-file dev/pci/drm/mga_drv.c mgadrm & !drm_external
-file dev/pci/drm/mga_irq.c mgadrm & !drm_external
-file dev/pci/drm/mga_state.c mgadrm & !drm_external
-file dev/pci/drm/mga_warp.c mgadrm & !drm_external
-
-file external/bsd/drm/dist/bsd-core/mga_drv.c mgadrm & drm_external
-file external/bsd/drm/dist/shared-core/mga_dma.c mgadrm & drm_external
-file external/bsd/drm/dist/shared-core/mga_irq.c mgadrm & drm_external
-file external/bsd/drm/dist/shared-core/mga_state.c mgadrm & drm_external
-file external/bsd/drm/dist/shared-core/mga_warp.c mgadrm & drm_external
+file dev/pci/drm/mga_dma.c mgadrm & drm_noexternal
+file dev/pci/drm/mga_drv.c mgadrm & drm_noexternal
+file dev/pci/drm/mga_irq.c mgadrm & drm_noexternal
+file dev/pci/drm/mga_state.c mgadrm & drm_noexternal
+file dev/pci/drm/mga_warp.c mgadrm & drm_noexternal
+
+file external/bsd/drm/dist/bsd-core/mga_drv.c mgadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/mga_dma.c mgadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/mga_irq.c mgadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/mga_state.c mgadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/mga_warp.c mgadrm & !drm_noexternal
# XXX missing: nouveau, nv
device r128drm: drmbase, drmpci
attach r128drm at drm
-file dev/pci/drm/ati_pcigart.c r128drm | radeondrm & !drm_external
-file dev/pci/drm/r128_cce.c r128drm & !drm_external
-file dev/pci/drm/r128_drv.c r128drm & !drm_external
-file dev/pci/drm/r128_irq.c r128drm & !drm_external
-file dev/pci/drm/r128_state.c r128drm & !drm_external
-
-file external/bsd/drm/dist/bsd-core/ati_pcigart.c (r128drm | radeondrm) & drm_external
-file external/bsd/drm/dist/bsd-core/r128_drv.c r128drm & drm_external
-file external/bsd/drm/dist/shared-core/r128_cce.c r128drm & drm_external
-file external/bsd/drm/dist/shared-core/r128_irq.c r128drm & drm_external
-file external/bsd/drm/dist/shared-core/r128_state.c r128drm & drm_external
+file dev/pci/drm/ati_pcigart.c (r128drm | radeondrm) & drm_noexternal
+file dev/pci/drm/r128_cce.c r128drm & drm_noexternal
+file dev/pci/drm/r128_drv.c r128drm & drm_noexternal
+file dev/pci/drm/r128_irq.c r128drm & drm_noexternal
+file dev/pci/drm/r128_state.c r128drm & drm_noexternal
+
+file external/bsd/drm/dist/bsd-core/ati_pcigart.c (r128drm | radeondrm) & !drm_noexternal
+file external/bsd/drm/dist/bsd-core/r128_drv.c r128drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/r128_cce.c r128drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/r128_irq.c r128drm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/r128_state.c r128drm & !drm_noexternal
device radeondrm: drmbase, drmpci
attach radeondrm at drm
-file dev/pci/drm/r300_cmdbuf.c radeondrm & !drm_external
-file dev/pci/drm/radeon_cp.c radeondrm & !drm_external
-file dev/pci/drm/radeon_drv.c radeondrm & !drm_external
-file dev/pci/drm/radeon_irq.c radeondrm & !drm_external
-file dev/pci/drm/radeon_mem.c radeondrm & !drm_external
-file dev/pci/drm/radeon_state.c radeondrm & !drm_external
-
-file external/bsd/drm/dist/bsd-core/radeon_drv.c radeondrm & drm_external
-file external/bsd/drm/dist/shared-core/r300_cmdbuf.c radeondrm & drm_external
-file external/bsd/drm/dist/shared-core/radeon_cp.c radeondrm & drm_external
-file external/bsd/drm/dist/shared-core/radeon_irq.c radeondrm & drm_external
-file external/bsd/drm/dist/shared-core/radeon_mem.c radeondrm & drm_external
-file external/bsd/drm/dist/shared-core/radeon_state.c radeondrm & drm_external
+file dev/pci/drm/r300_cmdbuf.c radeondrm & drm_noexternal
+file dev/pci/drm/radeon_cp.c radeondrm & drm_noexternal
+file dev/pci/drm/radeon_drv.c radeondrm & drm_noexternal
+file dev/pci/drm/radeon_irq.c radeondrm & drm_noexternal
+file dev/pci/drm/radeon_mem.c radeondrm & drm_noexternal
+file dev/pci/drm/radeon_state.c radeondrm & drm_noexternal
+
+file external/bsd/drm/dist/bsd-core/radeon_drv.c radeondrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/r300_cmdbuf.c radeondrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/r600_cp.c radeondrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/radeon_cp.c radeondrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/radeon_irq.c radeondrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/radeon_mem.c radeondrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/radeon_state.c radeondrm & !drm_noexternal
device savagedrm: drmbase, drmpci
attach savagedrm at drm
-file dev/pci/drm/savage_bci.c savagedrm & !drm_external
-file dev/pci/drm/savage_drv.c savagedrm & !drm_external
-file dev/pci/drm/savage_state.c savagedrm & !drm_external
-
-file external/bsd/drm/dist/bsd-core/savage_drv.c savagedrm & drm_external
-file external/bsd/drm/dist/shared-core/savage_bci.c savagedrm & drm_external
-file external/bsd/drm/dist/shared-core/savage_state.c savagedrm & drm_external
+file dev/pci/drm/savage_bci.c savagedrm & drm_noexternal
+file dev/pci/drm/savage_drv.c savagedrm & drm_noexternal
+file dev/pci/drm/savage_state.c savagedrm & drm_noexternal
+
+file external/bsd/drm/dist/bsd-core/savage_drv.c savagedrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/savage_bci.c savagedrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/savage_state.c savagedrm & !drm_noexternal
device sisdrm: drmbase, drmpci
attach sisdrm at drm
-file dev/pci/drm/sis_drv.c sisdrm & !drm_external
-file dev/pci/drm/sis_ds.c sisdrm & !drm_external
-file dev/pci/drm/sis_mm.c sisdrm & !drm_external
-
-file external/bsd/drm/dist/bsd-core/sis_drv.c sisdrm & drm_external
-file external/bsd/drm/dist/shared-core/sis_ds.c sisdrm & drm_external
-file external/bsd/drm/dist/shared-core/sis_mm.c sisdrm & drm_external
+file dev/pci/drm/sis_drv.c sisdrm & drm_noexternal
+file dev/pci/drm/sis_ds.c sisdrm & drm_noexternal
+file dev/pci/drm/sis_mm.c sisdrm & drm_noexternal
+
+file external/bsd/drm/dist/bsd-core/sis_drv.c sisdrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/sis_ds.c sisdrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/sis_mm.c sisdrm & !drm_noexternal
device tdfxdrm: drmbase, drmpci
attach tdfxdrm at drm
-file dev/pci/drm/tdfx_drv.c tdfxdrm & !drm_external
+file dev/pci/drm/tdfx_drv.c tdfxdrm & drm_noexternal
-file external/bsd/drm/dist/bsd-core/tdfx_drv.c tdfxdrm & drm_external
+file external/bsd/drm/dist/bsd-core/tdfx_drv.c tdfxdrm & !drm_noexternal
device viadrm: drmbase, drmpci
attach viadrm at drm
-file dev/pci/drm/via_drv.c viadrm & !drm_external
-file dev/pci/drm/via_dma.c viadrm & !drm_external
-file dev/pci/drm/via_ds.c viadrm & !drm_external
-file dev/pci/drm/via_irq.c viadrm & !drm_external
-file dev/pci/drm/via_map.c viadrm & !drm_external
-file dev/pci/drm/via_mm.c viadrm & !drm_external
-file dev/pci/drm/via_verifier.c viadrm & !drm_external
-file dev/pci/drm/via_video.c viadrm & !drm_external
-
-file external/bsd/drm/dist/bsd-core/via_drv.c viadrm & drm_external
-file external/bsd/drm/dist/shared-core/via_dma.c viadrm & drm_external
-file external/bsd/drm/dist/shared-core/via_ds.c viadrm & drm_external
-file external/bsd/drm/dist/shared-core/via_irq.c viadrm & drm_external
-file external/bsd/drm/dist/shared-core/via_map.c viadrm & drm_external
-file external/bsd/drm/dist/shared-core/via_mm.c viadrm & drm_external
-file external/bsd/drm/dist/shared-core/via_verifier.c viadrm & drm_external
-file external/bsd/drm/dist/shared-core/via_video.c viadrm & drm_external
-
-makeoptions drmpci CPPFLAGS+="-I$S/dev/pci/drm"
-
-# XXXMRG want to use the first one, but the second works.
-# XXXMRG remove the above when switching to this.
-#makeoptions (drmpci & !drm_external) CPPFLAGS+="-I$S/dev/pci/drm"
-#makeoptions drm_noexternal CPPFLAGS+="-I$S/dev/pci/drm"
+file dev/pci/drm/via_drv.c viadrm & drm_noexternal
+file dev/pci/drm/via_dma.c viadrm & drm_noexternal
+file dev/pci/drm/via_ds.c viadrm & drm_noexternal
+file dev/pci/drm/via_irq.c viadrm & drm_noexternal
+file dev/pci/drm/via_map.c viadrm & drm_noexternal
+file dev/pci/drm/via_mm.c viadrm & drm_noexternal
+file dev/pci/drm/via_verifier.c viadrm & drm_noexternal
+file dev/pci/drm/via_video.c viadrm & drm_noexternal
+
+file external/bsd/drm/dist/bsd-core/via_drv.c viadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/via_dma.c viadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/via_ds.c viadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/via_irq.c viadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/via_map.c viadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/via_mm.c viadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/via_verifier.c viadrm & !drm_noexternal
+file external/bsd/drm/dist/shared-core/via_video.c viadrm & !drm_noexternal
+
+# XXX uncomment this to use old non external drm
+#makeoptions drmbase CPPFLAGS+="-I$S/dev/drm"
