Tue Jun 23 07:01:42 2009 UTC ()
Apply patch (requested by mrg in ticket #827):
Default to the new drm code.


(snj)
diff -r1.6 -r1.6.4.1 src/sys/dev/drm/files.drm
diff -r1.3 -r1.3.4.1 src/sys/dev/pci/drm/files.pcidrm
cvs diff -r1.6 -r1.6.4.1 src/sys/dev/drm/files.drm (expand / switch to unified diff)

--- src/sys/dev/drm/files.drm 2008/07/19 07:26:54 1.6
+++ src/sys/dev/drm/files.drm 2009/06/23 07:01:41 1.6.4.1
@@ -1,46 +1,44 @@ @@ -1,46 +1,44 @@
1# $NetBSD: files.drm,v 1.6 2008/07/19 07:26:54 mrg Exp $ 1# $NetBSD: files.drm,v 1.6.4.1 2009/06/23 07:01:41 snj Exp $
2 2
3# direct rendering modules 3# direct rendering modules
4define drmbase 4define drmbase
5defflag opt_drm.h DRM_DEBUG DRM_NO_AGP DRM_NO_MTRR 5defflag opt_drm.h DRM_DEBUG DRM_NO_AGP DRM_NO_MTRR
6file dev/drm/drm_agpsupport.c drmbase & !drm_external 6file dev/drm/drm_agpsupport.c drmbase & drm_noexternal
7file dev/drm/drm_auth.c drmbase & !drm_external 7file dev/drm/drm_auth.c drmbase & drm_noexternal
8file dev/drm/drm_bufs.c drmbase & !drm_external 8file dev/drm/drm_bufs.c drmbase & drm_noexternal
9file dev/drm/drm_context.c drmbase & !drm_external 9file dev/drm/drm_context.c drmbase & drm_noexternal
10file dev/drm/drm_dma.c drmbase & !drm_external 10file dev/drm/drm_dma.c drmbase & drm_noexternal
11file dev/drm/drm_drawable.c drmbase & !drm_external 11file dev/drm/drm_drawable.c drmbase & drm_noexternal
12file dev/drm/drm_drv.c drmbase & !drm_external 12file dev/drm/drm_drv.c drmbase & drm_noexternal
13file dev/drm/drm_fops.c drmbase & !drm_external 13file dev/drm/drm_fops.c drmbase & drm_noexternal
14file dev/drm/drm_ioctl.c drmbase & !drm_external 14file dev/drm/drm_ioctl.c drmbase & drm_noexternal
15file dev/drm/drm_irq.c drmbase & !drm_external 15file dev/drm/drm_irq.c drmbase & drm_noexternal
16file dev/drm/drm_lock.c drmbase & !drm_external 16file dev/drm/drm_lock.c drmbase & drm_noexternal
17file dev/drm/drm_memory.c drmbase & !drm_external 17file dev/drm/drm_memory.c drmbase & drm_noexternal
18file dev/drm/drm_pci.c drmbase & !drm_external 18file dev/drm/drm_pci.c drmbase & drm_noexternal
19file dev/drm/drm_scatter.c drmbase & !drm_external 19file dev/drm/drm_scatter.c drmbase & drm_noexternal
20file dev/drm/drm_sysctl.c drmbase & !drm_external 20file dev/drm/drm_sysctl.c drmbase & drm_noexternal
21file dev/drm/drm_vm.c drmbase & !drm_external 21file dev/drm/drm_vm.c drmbase & drm_noexternal
22 22
23file external/bsd/drm/dist/bsd-core/drm_agpsupport.c drmbase & drm_external 23file external/bsd/drm/dist/bsd-core/drm_agpsupport.c drmbase & !drm_noexternal
24file external/bsd/drm/dist/bsd-core/drm_auth.c drmbase & drm_external 24file external/bsd/drm/dist/bsd-core/drm_auth.c drmbase & !drm_noexternal
25file external/bsd/drm/dist/bsd-core/drm_bufs.c drmbase & drm_external 25file external/bsd/drm/dist/bsd-core/drm_bufs.c drmbase & !drm_noexternal
26file external/bsd/drm/dist/bsd-core/drm_context.c drmbase & drm_external 26file external/bsd/drm/dist/bsd-core/drm_context.c drmbase & !drm_noexternal
27file external/bsd/drm/dist/bsd-core/drm_dma.c drmbase & drm_external 27file external/bsd/drm/dist/bsd-core/drm_dma.c drmbase & !drm_noexternal
28file external/bsd/drm/dist/bsd-core/drm_drawable.c drmbase & drm_external 28file external/bsd/drm/dist/bsd-core/drm_drawable.c drmbase & !drm_noexternal
29file external/bsd/drm/dist/bsd-core/drm_drv.c drmbase & drm_external 29file external/bsd/drm/dist/bsd-core/drm_drv.c drmbase & !drm_noexternal
30file external/bsd/drm/dist/bsd-core/drm_fops.c drmbase & drm_external 30file external/bsd/drm/dist/bsd-core/drm_fops.c drmbase & !drm_noexternal
31file external/bsd/drm/dist/bsd-core/drm_ioctl.c drmbase & drm_external 31file external/bsd/drm/dist/bsd-core/drm_ioctl.c drmbase & !drm_noexternal
32file external/bsd/drm/dist/bsd-core/drm_irq.c drmbase & drm_external 32file external/bsd/drm/dist/bsd-core/drm_irq.c drmbase & !drm_noexternal
33file external/bsd/drm/dist/bsd-core/drm_lock.c drmbase & drm_external 33file external/bsd/drm/dist/bsd-core/drm_lock.c drmbase & !drm_noexternal
34file external/bsd/drm/dist/bsd-core/drm_memory.c drmbase & drm_external 34file external/bsd/drm/dist/bsd-core/drm_memory.c drmbase & !drm_noexternal
35file external/bsd/drm/dist/bsd-core/drm_pci.c drmbase & drm_external 35file external/bsd/drm/dist/bsd-core/drm_pci.c drmbase & !drm_noexternal
36file external/bsd/drm/dist/bsd-core/drm_scatter.c drmbase & drm_external 36file external/bsd/drm/dist/bsd-core/drm_scatter.c drmbase & !drm_noexternal
37file external/bsd/drm/dist/bsd-core/drm_sysctl.c drmbase & drm_external 37file external/bsd/drm/dist/bsd-core/drm_sysctl.c drmbase & !drm_noexternal
38file external/bsd/drm/dist/bsd-core/drm_vm.c drmbase & drm_external 38file external/bsd/drm/dist/bsd-core/drm_vm.c drmbase & !drm_noexternal
39 39
40makeoptions drmbase CPPFLAGS+="-I$S/dev/drm" 40# XXX only one of these lines can be active. to use old drm please
41 41# XXX comment the first line and uncomment the second, and also see
42# XXXMRG want to use the first two, but the second two work. 42# XXX the line to uncomment in sys/dev/pci/drm/files.pcidrm
43#makeoptions drmbase & !drm_external CPPFLAGS+="-I$S/dev/drm" 43makeoptions drmbase CPPFLAGS+="-I$S/external/bsd/drm/dist/bsd-core -I$S/external/bsd/drm/dist/shared-core"
44#makeoptions drmbase & drm_external CPPFLAGS+="-I$S/external/bsd/drm/dist/bsd-core -I$S/external/bsd/drm/dist/shared-core" 44#makeoptions drmbase CPPFLAGS+="-I$S/dev/drm"
45#makeoptions drm_noexternal CPPFLAGS+="-I$S/dev/drm" 
46#makeoptions drm_external CPPFLAGS+="-I$S/external/bsd/drm/dist/bsd-core -I$S/external/bsd/drm/dist/shared-core" 
cvs diff -r1.3 -r1.3.4.1 src/sys/dev/pci/drm/Attic/files.pcidrm (expand / switch to unified diff)

--- src/sys/dev/pci/drm/Attic/files.pcidrm 2008/07/19 07:26:54 1.3
+++ src/sys/dev/pci/drm/Attic/files.pcidrm 2009/06/23 07:01:41 1.3.4.1
@@ -1,127 +1,124 @@ @@ -1,127 +1,124 @@
1# $NetBSD: files.pcidrm,v 1.3 2008/07/19 07:26:54 mrg Exp $ 1# $NetBSD: files.pcidrm,v 1.3.4.1 2009/06/23 07:01:41 snj Exp $
2 2
3define drmpci 3define drmpci
4 4
5device i915drm: drmbase, drmpci 5device i915drm: drmbase, drmpci
6attach i915drm at drm 6attach i915drm at drm
7file dev/pci/drm/i915_drv.c i915drm & !drm_external 7file dev/pci/drm/i915_drv.c i915drm & drm_noexternal
8file dev/pci/drm/i915_dma.c i915drm & !drm_external 8file dev/pci/drm/i915_dma.c i915drm & drm_noexternal
9file dev/pci/drm/i915_irq.c i915drm & !drm_external 9file dev/pci/drm/i915_irq.c i915drm & drm_noexternal
10file dev/pci/drm/i915_mem.c i915drm & !drm_external 10file dev/pci/drm/i915_mem.c i915drm & drm_noexternal
11 11
12file external/bsd/drm/dist/bsd-core/i915_drv.c i915drm & drm_external 12file external/bsd/drm/dist/bsd-core/i915_drv.c i915drm & !drm_noexternal
13file external/bsd/drm/dist/shared-core/i915_dma.c i915drm & drm_external 13file external/bsd/drm/dist/shared-core/i915_dma.c i915drm & !drm_noexternal
14file external/bsd/drm/dist/shared-core/i915_irq.c i915drm & drm_external 14file external/bsd/drm/dist/shared-core/i915_irq.c i915drm & !drm_noexternal
15file external/bsd/drm/dist/shared-core/i915_mem.c i915drm & drm_external 15file external/bsd/drm/dist/shared-core/i915_mem.c i915drm & !drm_noexternal
16file external/bsd/drm/dist/shared-core/i915_suspend.c i915drm & drm_external 16file external/bsd/drm/dist/shared-core/i915_suspend.c i915drm & !drm_noexternal
17 17
18device mach64drm: drmbase, drmpci 18device mach64drm: drmbase, drmpci
19attach mach64drm at drm 19attach mach64drm at drm
20file dev/pci/drm/mach64_dma.c mach64drm & !drm_external 20file dev/pci/drm/mach64_dma.c mach64drm & drm_noexternal
21file dev/pci/drm/mach64_drv.c mach64drm & !drm_external 21file dev/pci/drm/mach64_drv.c mach64drm & drm_noexternal
22file dev/pci/drm/mach64_irq.c mach64drm & !drm_external 22file dev/pci/drm/mach64_irq.c mach64drm & drm_noexternal
23file dev/pci/drm/mach64_state.c mach64drm & !drm_external 23file dev/pci/drm/mach64_state.c mach64drm & drm_noexternal
24 24
25file external/bsd/drm/dist/bsd-core/mach64_drv.c mach64drm & drm_external 25file external/bsd/drm/dist/bsd-core/mach64_drv.c mach64drm & !drm_noexternal
26file external/bsd/drm/dist/shared-core/mach64_dma.c mach64drm & drm_external 26file external/bsd/drm/dist/shared-core/mach64_dma.c mach64drm & !drm_noexternal
27file external/bsd/drm/dist/shared-core/mach64_irq.c mach64drm & drm_external 27file external/bsd/drm/dist/shared-core/mach64_irq.c mach64drm & !drm_noexternal
28file external/bsd/drm/dist/shared-core/mach64_state.c mach64drm & drm_external 28file external/bsd/drm/dist/shared-core/mach64_state.c mach64drm & !drm_noexternal
29 29
30device mgadrm: drmbase, drmpci 30device mgadrm: drmbase, drmpci
31attach mgadrm at drm 31attach mgadrm at drm
32file dev/pci/drm/mga_dma.c mgadrm & !drm_external 32file dev/pci/drm/mga_dma.c mgadrm & drm_noexternal
33file dev/pci/drm/mga_drv.c mgadrm & !drm_external 33file dev/pci/drm/mga_drv.c mgadrm & drm_noexternal
34file dev/pci/drm/mga_irq.c mgadrm & !drm_external 34file dev/pci/drm/mga_irq.c mgadrm & drm_noexternal
35file dev/pci/drm/mga_state.c mgadrm & !drm_external 35file dev/pci/drm/mga_state.c mgadrm & drm_noexternal
36file dev/pci/drm/mga_warp.c mgadrm & !drm_external 36file dev/pci/drm/mga_warp.c mgadrm & drm_noexternal
37 37
38file external/bsd/drm/dist/bsd-core/mga_drv.c mgadrm & drm_external 38file external/bsd/drm/dist/bsd-core/mga_drv.c mgadrm & !drm_noexternal
39file external/bsd/drm/dist/shared-core/mga_dma.c mgadrm & drm_external 39file external/bsd/drm/dist/shared-core/mga_dma.c mgadrm & !drm_noexternal
40file external/bsd/drm/dist/shared-core/mga_irq.c mgadrm & drm_external 40file external/bsd/drm/dist/shared-core/mga_irq.c mgadrm & !drm_noexternal
41file external/bsd/drm/dist/shared-core/mga_state.c mgadrm & drm_external 41file external/bsd/drm/dist/shared-core/mga_state.c mgadrm & !drm_noexternal
42file external/bsd/drm/dist/shared-core/mga_warp.c mgadrm & drm_external 42file external/bsd/drm/dist/shared-core/mga_warp.c mgadrm & !drm_noexternal
43 43
44# XXX missing: nouveau, nv 44# XXX missing: nouveau, nv
45 45
46device r128drm: drmbase, drmpci 46device r128drm: drmbase, drmpci
47attach r128drm at drm 47attach r128drm at drm
48file dev/pci/drm/ati_pcigart.c r128drm | radeondrm & !drm_external 48file dev/pci/drm/ati_pcigart.c (r128drm | radeondrm) & drm_noexternal
49file dev/pci/drm/r128_cce.c r128drm & !drm_external 49file dev/pci/drm/r128_cce.c r128drm & drm_noexternal
50file dev/pci/drm/r128_drv.c r128drm & !drm_external 50file dev/pci/drm/r128_drv.c r128drm & drm_noexternal
51file dev/pci/drm/r128_irq.c r128drm & !drm_external 51file dev/pci/drm/r128_irq.c r128drm & drm_noexternal
52file dev/pci/drm/r128_state.c r128drm & !drm_external 52file dev/pci/drm/r128_state.c r128drm & drm_noexternal
53 53
54file external/bsd/drm/dist/bsd-core/ati_pcigart.c (r128drm | radeondrm) & drm_external 54file external/bsd/drm/dist/bsd-core/ati_pcigart.c (r128drm | radeondrm) & !drm_noexternal
55file external/bsd/drm/dist/bsd-core/r128_drv.c r128drm & drm_external 55file external/bsd/drm/dist/bsd-core/r128_drv.c r128drm & !drm_noexternal
56file external/bsd/drm/dist/shared-core/r128_cce.c r128drm & drm_external 56file external/bsd/drm/dist/shared-core/r128_cce.c r128drm & !drm_noexternal
57file external/bsd/drm/dist/shared-core/r128_irq.c r128drm & drm_external 57file external/bsd/drm/dist/shared-core/r128_irq.c r128drm & !drm_noexternal
58file external/bsd/drm/dist/shared-core/r128_state.c r128drm & drm_external 58file external/bsd/drm/dist/shared-core/r128_state.c r128drm & !drm_noexternal
59 59
60device radeondrm: drmbase, drmpci 60device radeondrm: drmbase, drmpci
61attach radeondrm at drm 61attach radeondrm at drm
62file dev/pci/drm/r300_cmdbuf.c radeondrm & !drm_external 62file dev/pci/drm/r300_cmdbuf.c radeondrm & drm_noexternal
63file dev/pci/drm/radeon_cp.c radeondrm & !drm_external 63file dev/pci/drm/radeon_cp.c radeondrm & drm_noexternal
64file dev/pci/drm/radeon_drv.c radeondrm & !drm_external 64file dev/pci/drm/radeon_drv.c radeondrm & drm_noexternal
65file dev/pci/drm/radeon_irq.c radeondrm & !drm_external 65file dev/pci/drm/radeon_irq.c radeondrm & drm_noexternal
66file dev/pci/drm/radeon_mem.c radeondrm & !drm_external 66file dev/pci/drm/radeon_mem.c radeondrm & drm_noexternal
67file dev/pci/drm/radeon_state.c radeondrm & !drm_external 67file dev/pci/drm/radeon_state.c radeondrm & drm_noexternal
68 68
69file external/bsd/drm/dist/bsd-core/radeon_drv.c radeondrm & drm_external 69file external/bsd/drm/dist/bsd-core/radeon_drv.c radeondrm & !drm_noexternal
70file external/bsd/drm/dist/shared-core/r300_cmdbuf.c radeondrm & drm_external 70file external/bsd/drm/dist/shared-core/r300_cmdbuf.c radeondrm & !drm_noexternal
71file external/bsd/drm/dist/shared-core/radeon_cp.c radeondrm & drm_external 71file external/bsd/drm/dist/shared-core/r600_cp.c radeondrm & !drm_noexternal
72file external/bsd/drm/dist/shared-core/radeon_irq.c radeondrm & drm_external 72file external/bsd/drm/dist/shared-core/radeon_cp.c radeondrm & !drm_noexternal
73file external/bsd/drm/dist/shared-core/radeon_mem.c radeondrm & drm_external 73file external/bsd/drm/dist/shared-core/radeon_irq.c radeondrm & !drm_noexternal
74file external/bsd/drm/dist/shared-core/radeon_state.c radeondrm & drm_external 74file external/bsd/drm/dist/shared-core/radeon_mem.c radeondrm & !drm_noexternal
 75file external/bsd/drm/dist/shared-core/radeon_state.c radeondrm & !drm_noexternal
75 76
76device savagedrm: drmbase, drmpci 77device savagedrm: drmbase, drmpci
77attach savagedrm at drm 78attach savagedrm at drm
78file dev/pci/drm/savage_bci.c savagedrm & !drm_external 79file dev/pci/drm/savage_bci.c savagedrm & drm_noexternal
79file dev/pci/drm/savage_drv.c savagedrm & !drm_external 80file dev/pci/drm/savage_drv.c savagedrm & drm_noexternal
80file dev/pci/drm/savage_state.c savagedrm & !drm_external 81file dev/pci/drm/savage_state.c savagedrm & drm_noexternal
81 82
82file external/bsd/drm/dist/bsd-core/savage_drv.c savagedrm & drm_external 83file external/bsd/drm/dist/bsd-core/savage_drv.c savagedrm & !drm_noexternal
83file external/bsd/drm/dist/shared-core/savage_bci.c savagedrm & drm_external 84file external/bsd/drm/dist/shared-core/savage_bci.c savagedrm & !drm_noexternal
84file external/bsd/drm/dist/shared-core/savage_state.c savagedrm & drm_external 85file external/bsd/drm/dist/shared-core/savage_state.c savagedrm & !drm_noexternal
85 86
86device sisdrm: drmbase, drmpci 87device sisdrm: drmbase, drmpci
87attach sisdrm at drm 88attach sisdrm at drm
88file dev/pci/drm/sis_drv.c sisdrm & !drm_external 89file dev/pci/drm/sis_drv.c sisdrm & drm_noexternal
89file dev/pci/drm/sis_ds.c sisdrm & !drm_external 90file dev/pci/drm/sis_ds.c sisdrm & drm_noexternal
90file dev/pci/drm/sis_mm.c sisdrm & !drm_external 91file dev/pci/drm/sis_mm.c sisdrm & drm_noexternal
91 92
92file external/bsd/drm/dist/bsd-core/sis_drv.c sisdrm & drm_external 93file external/bsd/drm/dist/bsd-core/sis_drv.c sisdrm & !drm_noexternal
93file external/bsd/drm/dist/shared-core/sis_ds.c sisdrm & drm_external 94file external/bsd/drm/dist/shared-core/sis_ds.c sisdrm & !drm_noexternal
94file external/bsd/drm/dist/shared-core/sis_mm.c sisdrm & drm_external 95file external/bsd/drm/dist/shared-core/sis_mm.c sisdrm & !drm_noexternal
95 96
96device tdfxdrm: drmbase, drmpci 97device tdfxdrm: drmbase, drmpci
97attach tdfxdrm at drm 98attach tdfxdrm at drm
98file dev/pci/drm/tdfx_drv.c tdfxdrm & !drm_external 99file dev/pci/drm/tdfx_drv.c tdfxdrm & drm_noexternal
99 100
100file external/bsd/drm/dist/bsd-core/tdfx_drv.c tdfxdrm & drm_external 101file external/bsd/drm/dist/bsd-core/tdfx_drv.c tdfxdrm & !drm_noexternal
101 102
102device viadrm: drmbase, drmpci 103device viadrm: drmbase, drmpci
103attach viadrm at drm 104attach viadrm at drm
104file dev/pci/drm/via_drv.c viadrm & !drm_external 105file dev/pci/drm/via_drv.c viadrm & drm_noexternal
105file dev/pci/drm/via_dma.c viadrm & !drm_external 106file dev/pci/drm/via_dma.c viadrm & drm_noexternal
106file dev/pci/drm/via_ds.c viadrm & !drm_external 107file dev/pci/drm/via_ds.c viadrm & drm_noexternal
107file dev/pci/drm/via_irq.c viadrm & !drm_external 108file dev/pci/drm/via_irq.c viadrm & drm_noexternal
108file dev/pci/drm/via_map.c viadrm & !drm_external 109file dev/pci/drm/via_map.c viadrm & drm_noexternal
109file dev/pci/drm/via_mm.c viadrm & !drm_external 110file dev/pci/drm/via_mm.c viadrm & drm_noexternal
110file dev/pci/drm/via_verifier.c viadrm & !drm_external 111file dev/pci/drm/via_verifier.c viadrm & drm_noexternal
111file dev/pci/drm/via_video.c viadrm & !drm_external 112file dev/pci/drm/via_video.c viadrm & drm_noexternal
112 113
113file external/bsd/drm/dist/bsd-core/via_drv.c viadrm & drm_external 114file external/bsd/drm/dist/bsd-core/via_drv.c viadrm & !drm_noexternal
114file external/bsd/drm/dist/shared-core/via_dma.c viadrm & drm_external 115file external/bsd/drm/dist/shared-core/via_dma.c viadrm & !drm_noexternal
115file external/bsd/drm/dist/shared-core/via_ds.c viadrm & drm_external 116file external/bsd/drm/dist/shared-core/via_ds.c viadrm & !drm_noexternal
116file external/bsd/drm/dist/shared-core/via_irq.c viadrm & drm_external 117file external/bsd/drm/dist/shared-core/via_irq.c viadrm & !drm_noexternal
117file external/bsd/drm/dist/shared-core/via_map.c viadrm & drm_external 118file external/bsd/drm/dist/shared-core/via_map.c viadrm & !drm_noexternal
118file external/bsd/drm/dist/shared-core/via_mm.c viadrm & drm_external 119file external/bsd/drm/dist/shared-core/via_mm.c viadrm & !drm_noexternal
119file external/bsd/drm/dist/shared-core/via_verifier.c viadrm & drm_external 120file external/bsd/drm/dist/shared-core/via_verifier.c viadrm & !drm_noexternal
120file external/bsd/drm/dist/shared-core/via_video.c viadrm & drm_external 121file external/bsd/drm/dist/shared-core/via_video.c viadrm & !drm_noexternal
121 122
122makeoptions drmpci CPPFLAGS+="-I$S/dev/pci/drm" 123# XXX uncomment this to use old non external drm
123 124#makeoptions drmbase CPPFLAGS+="-I$S/dev/drm"
124# XXXMRG want to use the first one, but the second works. 
125# XXXMRG remove the above when switching to this. 
126#makeoptions (drmpci & !drm_external) CPPFLAGS+="-I$S/dev/pci/drm" 
127#makeoptions drm_noexternal CPPFLAGS+="-I$S/dev/pci/drm"