head 1.3; access; symbols netbsd-11-0-RC4:1.3 netbsd-11-0-RC3:1.3 netbsd-11-0-RC2:1.3 netbsd-11-0-RC1:1.3 perseant-exfatfs-base-20250801:1.3 netbsd-11:1.3.0.102 netbsd-11-base:1.3 netbsd-10-1-RELEASE:1.3 perseant-exfatfs-base-20240630:1.3 perseant-exfatfs:1.3.0.100 perseant-exfatfs-base:1.3 netbsd-8-3-RELEASE:1.3 netbsd-9-4-RELEASE:1.3 netbsd-10-0-RELEASE:1.3 netbsd-10-0-RC6:1.3 netbsd-10-0-RC5:1.3 netbsd-10-0-RC4:1.3 netbsd-10-0-RC3:1.3 netbsd-10-0-RC2:1.3 thorpej-ifq:1.3.0.98 thorpej-ifq-base:1.3 thorpej-altq-separation:1.3.0.96 thorpej-altq-separation-base:1.3 netbsd-10-0-RC1:1.3 netbsd-10:1.3.0.94 netbsd-10-base:1.3 bouyer-sunxi-drm:1.3.0.92 bouyer-sunxi-drm-base:1.3 netbsd-9-3-RELEASE:1.3 thorpej-i2c-spi-conf2:1.3.0.90 thorpej-i2c-spi-conf2-base:1.3 thorpej-futex2:1.3.0.88 thorpej-futex2-base:1.3 thorpej-cfargs2:1.3.0.86 thorpej-cfargs2-base:1.3 cjep_sun2x-base1:1.3 cjep_sun2x:1.3.0.84 cjep_sun2x-base:1.3 cjep_staticlib_x-base1:1.3 netbsd-9-2-RELEASE:1.3 cjep_staticlib_x:1.3.0.82 cjep_staticlib_x-base:1.3 thorpej-i2c-spi-conf:1.3.0.80 thorpej-i2c-spi-conf-base:1.3 thorpej-cfargs:1.3.0.78 thorpej-cfargs-base:1.3 thorpej-futex:1.3.0.76 thorpej-futex-base:1.3 netbsd-9-1-RELEASE:1.3 bouyer-xenpvh-base2:1.3 phil-wifi-20200421:1.3 bouyer-xenpvh-base1:1.3 phil-wifi-20200411:1.3 bouyer-xenpvh:1.3.0.74 bouyer-xenpvh-base:1.3 is-mlppp:1.3.0.72 is-mlppp-base:1.3 phil-wifi-20200406:1.3 netbsd-8-2-RELEASE:1.3 ad-namecache-base3:1.3 netbsd-9-0-RELEASE:1.3 netbsd-9-0-RC2:1.3 ad-namecache-base2:1.3 ad-namecache-base1:1.3 ad-namecache:1.3.0.70 ad-namecache-base:1.3 netbsd-9-0-RC1:1.3 phil-wifi-20191119:1.3 netbsd-9:1.3.0.68 netbsd-9-base:1.3 phil-wifi-20190609:1.3 netbsd-8-1-RELEASE:1.3 netbsd-8-1-RC1:1.3 isaki-audio2:1.3.0.66 isaki-audio2-base:1.3 pgoyette-compat-merge-20190127:1.3 pgoyette-compat-20190127:1.3 pgoyette-compat-20190118:1.3 pgoyette-compat-1226:1.3 pgoyette-compat-1126:1.3 pgoyette-compat-1020:1.3 pgoyette-compat-0930:1.3 pgoyette-compat-0906:1.3 netbsd-7-2-RELEASE:1.3 pgoyette-compat-0728:1.3 netbsd-8-0-RELEASE:1.3 phil-wifi:1.3.0.64 phil-wifi-base:1.3 pgoyette-compat-0625:1.3 netbsd-8-0-RC2:1.3 pgoyette-compat-0521:1.3 pgoyette-compat-0502:1.3 pgoyette-compat-0422:1.3 netbsd-8-0-RC1:1.3 pgoyette-compat-0415:1.3 pgoyette-compat-0407:1.3 pgoyette-compat-0330:1.3 pgoyette-compat-0322:1.3 pgoyette-compat-0315:1.3 netbsd-7-1-2-RELEASE:1.3 pgoyette-compat:1.3.0.62 pgoyette-compat-base:1.3 netbsd-7-1-1-RELEASE:1.3 tls-maxphys-base-20171202:1.3 matt-nb8-mediatek:1.3.0.60 matt-nb8-mediatek-base:1.3 nick-nhusb-base-20170825:1.3 perseant-stdc-iso10646:1.3.0.58 perseant-stdc-iso10646-base:1.3 netbsd-8:1.3.0.56 netbsd-8-base:1.3 prg-localcount2-base3:1.3 prg-localcount2-base2:1.3 prg-localcount2-base1:1.3 prg-localcount2:1.3.0.54 prg-localcount2-base:1.3 pgoyette-localcount-20170426:1.3 bouyer-socketcan-base1:1.3 jdolecek-ncq:1.3.0.52 jdolecek-ncq-base:1.3 pgoyette-localcount-20170320:1.3 netbsd-7-1:1.3.0.50 netbsd-7-1-RELEASE:1.3 netbsd-7-1-RC2:1.3 nick-nhusb-base-20170204:1.3 netbsd-7-nhusb-base-20170116:1.3 bouyer-socketcan:1.3.0.48 bouyer-socketcan-base:1.3 pgoyette-localcount-20170107:1.3 netbsd-7-1-RC1:1.3 nick-nhusb-base-20161204:1.3 pgoyette-localcount-20161104:1.3 netbsd-7-0-2-RELEASE:1.3 nick-nhusb-base-20161004:1.3 localcount-20160914:1.3 netbsd-7-nhusb:1.3.0.46 netbsd-7-nhusb-base:1.3 pgoyette-localcount-20160806:1.3 pgoyette-localcount-20160726:1.3 pgoyette-localcount:1.3.0.44 pgoyette-localcount-base:1.3 nick-nhusb-base-20160907:1.3 nick-nhusb-base-20160529:1.3 netbsd-7-0-1-RELEASE:1.3 nick-nhusb-base-20160422:1.3 nick-nhusb-base-20160319:1.3 nick-nhusb-base-20151226:1.3 netbsd-7-0:1.3.0.42 netbsd-7-0-RELEASE:1.3 nick-nhusb-base-20150921:1.3 netbsd-7-0-RC3:1.3 netbsd-7-0-RC2:1.3 netbsd-7-0-RC1:1.3 nick-nhusb-base-20150606:1.3 nick-nhusb-base-20150406:1.3 nick-nhusb:1.3.0.40 nick-nhusb-base:1.3 netbsd-5-2-3-RELEASE:1.2.10.1 netbsd-5-1-5-RELEASE:1.2.10.1 netbsd-6-0-6-RELEASE:1.3 netbsd-6-1-5-RELEASE:1.3 netbsd-7:1.3.0.38 netbsd-7-base:1.3 yamt-pagecache-base9:1.3 yamt-pagecache-tag8:1.3 netbsd-6-1-4-RELEASE:1.3 netbsd-6-0-5-RELEASE:1.3 tls-earlyentropy:1.3.0.36 tls-earlyentropy-base:1.3 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.3 riastradh-drm2-base3:1.3 netbsd-6-1-3-RELEASE:1.3 netbsd-6-0-4-RELEASE:1.3 netbsd-5-2-2-RELEASE:1.2.10.1 netbsd-5-1-4-RELEASE:1.2.10.1 netbsd-6-1-2-RELEASE:1.3 netbsd-6-0-3-RELEASE:1.3 netbsd-5-2-1-RELEASE:1.2.10.1 netbsd-5-1-3-RELEASE:1.2.10.1 rmind-smpnet-nbase:1.3 netbsd-6-1-1-RELEASE:1.3 riastradh-drm2-base2:1.3 riastradh-drm2-base1:1.3 riastradh-drm2:1.3.0.34 riastradh-drm2-base:1.3 rmind-smpnet:1.3.0.26 rmind-smpnet-base:1.3 netbsd-6-1:1.3.0.32 netbsd-6-0-2-RELEASE:1.3 netbsd-6-1-RELEASE:1.3 khorben-n900:1.3.0.30 netbsd-6-1-RC4:1.3 netbsd-6-1-RC3:1.3 agc-symver:1.3.0.28 agc-symver-base:1.3 netbsd-6-1-RC2:1.3 netbsd-6-1-RC1:1.3 yamt-pagecache-base8:1.3 netbsd-5-2:1.2.10.1.0.6 netbsd-6-0-1-RELEASE:1.3 yamt-pagecache-base7:1.3 netbsd-5-2-RELEASE:1.2.10.1 netbsd-5-2-RC1:1.2.10.1 matt-nb6-plus-nbase:1.3 yamt-pagecache-base6:1.3 netbsd-6-0:1.3.0.24 netbsd-6-0-RELEASE:1.3 netbsd-6-0-RC2:1.3 tls-maxphys:1.3.0.22 tls-maxphys-base:1.3 matt-nb6-plus:1.3.0.20 matt-nb6-plus-base:1.3 netbsd-6-0-RC1:1.3 jmcneill-usbmp-base10:1.3 yamt-pagecache-base5:1.3 jmcneill-usbmp-base9:1.3 yamt-pagecache-base4:1.3 jmcneill-usbmp-base8:1.3 jmcneill-usbmp-base7:1.3 jmcneill-usbmp-base6:1.3 jmcneill-usbmp-base5:1.3 jmcneill-usbmp-base4:1.3 jmcneill-usbmp-base3:1.3 jmcneill-usbmp-pre-base2:1.3 jmcneill-usbmp-base2:1.3 netbsd-6:1.3.0.18 netbsd-6-base:1.3 netbsd-5-1-2-RELEASE:1.2.10.1 netbsd-5-1-1-RELEASE:1.2.10.1 jmcneill-usbmp:1.3.0.16 jmcneill-usbmp-base:1.3 jmcneill-audiomp3:1.3.0.14 jmcneill-audiomp3-base:1.3 yamt-pagecache-base3:1.3 yamt-pagecache-base2:1.3 yamt-pagecache:1.3.0.12 yamt-pagecache-base:1.3 rmind-uvmplock-nbase:1.3 cherry-xenmp:1.3.0.10 cherry-xenmp-base:1.3 bouyer-quota2-nbase:1.3 bouyer-quota2:1.3.0.8 bouyer-quota2-base:1.3 jruoho-x86intr:1.3.0.6 jruoho-x86intr-base:1.3 matt-mips64-premerge-20101231:1.3 matt-nb5-mips64-premerge-20101231:1.2.20.1 matt-nb5-pq3:1.2.10.1.0.4 matt-nb5-pq3-base:1.2.10.1 netbsd-5-1:1.2.10.1.0.2 netbsd-5-1-RELEASE:1.2.10.1 uebayasi-xip-base4:1.3 uebayasi-xip-base3:1.3 yamt-nfs-mp-base11:1.3 netbsd-5-1-RC4:1.2.10.1 matt-nb5-mips64-k15:1.2.20.1 uebayasi-xip-base2:1.3 yamt-nfs-mp-base10:1.3 netbsd-5-1-RC3:1.2.10.1 netbsd-5-1-RC2:1.2.10.1 uebayasi-xip-base1:1.3 netbsd-5-1-RC1:1.2.10.1 rmind-uvmplock:1.3.0.4 rmind-uvmplock-base:1.3 yamt-nfs-mp-base9:1.3 uebayasi-xip:1.3.0.2 uebayasi-xip-base:1.3 netbsd-5-0-2-RELEASE:1.2 matt-nb5-mips64-premerge-20091211:1.2 matt-premerge-20091211:1.3 yamt-nfs-mp-base8:1.3 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.2 matt-nb4-mips64-k7-u2a-k9b:1.2 matt-nb5-mips64-u1-k1-k5:1.2 yamt-nfs-mp-base7:1.3 matt-nb5-mips64:1.2.0.20 netbsd-5-0-1-RELEASE:1.2 jymxensuspend-base:1.3 yamt-nfs-mp-base6:1.3 git-change-85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c:1.1.1.2 yamt-nfs-mp-base5:1.2 yamt-nfs-mp-base4:1.2 jym-xensuspend-nbase:1.3 yamt-nfs-mp:1.2.0.18 yamt-nfs-mp-base3:1.2 nick-hppapmap-base4:1.2 nick-hppapmap-base3:1.2 netbsd-5-0:1.2.0.16 netbsd-5-0-RELEASE:1.2 netbsd-5-0-RC4:1.2 netbsd-5-0-RC3:1.2 nick-hppapmap-base2:1.2 netbsd-5-0-RC2:1.2 jym-xensuspend:1.2.0.14 jym-xensuspend-base:1.2 netbsd-5-0-RC1:1.2 haad-dm-base:1.2 haad-dm-base2:1.2 haad-nbase2:1.2 ad-audiomp2:1.2.0.12 ad-audiomp2-base:1.2 netbsd-5:1.2.0.10 netbsd-5-base:1.2 nick-hppapmap:1.2.0.8 nick-hppapmap-base:1.2 matt-mips64-base2:1.2 haad-dm-base1:1.2 wrstuden-revivesa-base-4:1.2 mjf-devfs2-base:1.2 mjf-devfs2:1.2.0.6 wrstuden-revivesa-base-3:1.2 wrstuden-revivesa:1.2.0.4 wrstuden-revivesa-base-2:1.2 simonb-wapbl-base:1.2 simonb-wapbl:1.2.0.2 simonb-wapbl-nbase:1.2 git-change-2580a065d81be645a14af1e91b8441f7e72fcbe4:1.1.1.1 git-change-04893aa99abfbed8eb6d7067a974fa1f31193c87:1.1.1.1 mrg-before-jul19:1.2 git-change-5d27fd94afaaf434c3a92af0075420b550055bfb:1.1.1.1 mesa-drm:1.1.1; locks; strict; comment @# @; 1.3 date 2009.06.19.03.50.03; author mrg; state Exp; branches; next 1.2; 1.2 date 2008.07.19.06.14.25; author mrg; state Exp; branches 1.2.2.1 1.2.4.1 1.2.6.1 1.2.10.1 1.2.14.1 1.2.18.1 1.2.20.1; next 1.1; 1.1 date 2008.07.19.05.30.36; author mrg; state Exp; branches 1.1.1.1; next ; 1.2.2.1 date 2008.07.19.06.14.25; author simonb; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2008.07.28.14.37.28; author simonb; state Exp; branches; next ; 1.2.4.1 date 2008.07.19.06.14.25; author wrstuden; state dead; branches; next 1.2.4.2; 1.2.4.2 date 2008.09.18.04.36.47; author wrstuden; state Exp; branches; next ; 1.2.6.1 date 2008.07.19.06.14.25; author mjf; state dead; branches; next 1.2.6.2; 1.2.6.2 date 2008.09.28.10.40.36; author mjf; state Exp; branches; next ; 1.2.10.1 date 2009.06.20.23.36.59; author snj; state Exp; branches; next ; 1.2.14.1 date 2009.07.23.23.32.21; author jym; state Exp; branches; next ; 1.2.18.1 date 2008.07.19.06.14.25; author yamt; state dead; branches; next 1.2.18.2; 1.2.18.2 date 2009.05.04.08.13.28; author yamt; state Exp; branches; next 1.2.18.3; 1.2.18.3 date 2009.07.18.14.53.12; author yamt; state Exp; branches; next ; 1.2.20.1 date 2010.04.21.00.27.55; author matt; state Exp; branches; next ; 1.1.1.1 date 2008.07.19.05.30.36; author mrg; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2009.06.19.03.22.23; author mrg; state Exp; branches; next ; desc @@ 1.3 log @merge the changes from drm 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c with our changes and the work recently done by Arto Huusko and FUKAUMI Naoki . it includes all the changes arto provided from both mesa-drm and the r6xx-r7xx-support branch. it does not yet include code to handle the (deleted) drm_pciids.h file, but i'll probably just check in a generated one for now. i have not yet merged the changes from outside this dir. from arto's messages to tech-x11: The important change that was needed is that drm_scatter.c was fixed to return pointer to all allocated pages, not just the beginning of the allocated segments. Other changes: - drm_scatter maps COHERENT memory - drm_drawable: drawable handle allocation is done inside lock - drm_memory: when mapping "agp" memory, store offset of mapped area, so that new requests to same offset return the same area instead of trying to remap and fail - drm_vm: use bus_space_mmap for frame buffer and registers - r600_cp.c: ioremapfree allocated gart range - radeon_cp.c: use mtsleep - some memset calls I had added had their args swapped, and no memory was cleared @ text @SHARED= ../shared-core SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 #nouveau .include depend: drm_pciids.h all: drm_pciids.h drm_pciids.h: ${SHARED}/drm_pciids.txt sh ../scripts/create_bsd_pci_lists.sh < ${SHARED}/drm_pciids.txt @ 1.2 log @include bsd.subdir.mk @ text @d3 1 a3 1 SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 # via a11 2 .include @ 1.2.20.1 log @sync to netbsd-5 @ text @d3 1 a3 1 SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 #nouveau d12 2 @ 1.2.14.1 log @Sync with HEAD. @ text @d3 1 a3 1 SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 #nouveau d12 2 @ 1.2.10.1 log @Apply patch (requested by mrg in ticket #823): import mesa-drm git from version 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c. -- merge the changes from drm 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c with our changes and the work recently done by Arto Huusko and FUKAUMI Naoki. it includes all the changes arto provided from both mesa-drm and the r6xx-r7xx-support branch. it does not yet include code to handle the (deleted) drm_pciids.h file, but i'll probably just check in a generated one for now. i have not yet merged the changes from outside this dir. from arto's messages to tech-x11: The important change that was needed is that drm_scatter.c was fixed to return pointer to all allocated pages, not just the beginning of the allocated segments. Other changes: - drm_scatter maps COHERENT memory - drm_drawable: drawable handle allocation is done inside lock - drm_memory: when mapping "agp" memory, store offset of mapped area, so that new requests to same offset return the same area instead of trying to remap and fail - drm_vm: use bus_space_mmap for frame buffer and registers - r600_cp.c: ioremapfree allocated gart range - radeon_cp.c: use mtsleep - some memset calls I had added had their args swapped, and no memory was cleared -- add a freshly generated drm_pciids.h -- some minor clean up: - reduce diffs to mesa-drm where possible - fix various formatting issues - netbsd uses major 180 for drm (XXX) @ text @d3 1 a3 1 SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 #nouveau d12 2 @ 1.2.18.1 log @file Makefile was added on branch yamt-nfs-mp on 2009-05-04 08:13:28 +0000 @ text @d1 13 @ 1.2.18.2 log @sync with head. @ text @a0 13 SHARED= ../shared-core SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 # via .include depend: drm_pciids.h all: drm_pciids.h drm_pciids.h: ${SHARED}/drm_pciids.txt sh ../scripts/create_bsd_pci_lists.sh < ${SHARED}/drm_pciids.txt .include @ 1.2.18.3 log @sync with head. @ text @d3 1 a3 1 SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 #nouveau d12 2 @ 1.2.6.1 log @file Makefile was added on branch mjf-devfs2 on 2008-09-28 10:40:36 +0000 @ text @d1 13 @ 1.2.6.2 log @Sync with HEAD. @ text @a0 13 SHARED= ../shared-core SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 # via .include depend: drm_pciids.h all: drm_pciids.h drm_pciids.h: ${SHARED}/drm_pciids.txt sh ../scripts/create_bsd_pci_lists.sh < ${SHARED}/drm_pciids.txt .include @ 1.2.4.1 log @file Makefile was added on branch wrstuden-revivesa on 2008-09-18 04:36:47 +0000 @ text @d1 13 @ 1.2.4.2 log @Sync with wrstuden-revivesa-base-2. @ text @a0 13 SHARED= ../shared-core SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 # via .include depend: drm_pciids.h all: drm_pciids.h drm_pciids.h: ${SHARED}/drm_pciids.txt sh ../scripts/create_bsd_pci_lists.sh < ${SHARED}/drm_pciids.txt .include @ 1.2.2.1 log @file Makefile was added on branch simonb-wapbl on 2008-07-28 14:37:28 +0000 @ text @d1 13 @ 1.2.2.2 log @Sync with head. @ text @a0 13 SHARED= ../shared-core SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 # via .include depend: drm_pciids.h all: drm_pciids.h drm_pciids.h: ${SHARED}/drm_pciids.txt sh ../scripts/create_bsd_pci_lists.sh < ${SHARED}/drm_pciids.txt .include @ 1.1 log @Initial revision @ text @d12 2 @ 1.1.1.1 log @import mesa-drm git from version 5d27fd94afaaf434c3a92af0075420b550055bfb, which is approximately june 25th or so. @ text @@ 1.1.1.2 log @import mesa-drm git from version 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c. @ text @d3 1 a3 1 SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 #nouveau @