head 1.1; access; symbols perseant-exfatfs-base-20250801:1.1 perseant-exfatfs-base-20240630:1.1 perseant-exfatfs:1.1.0.46 perseant-exfatfs-base:1.1 bouyer-sunxi-drm:1.1.0.44 bouyer-sunxi-drm-base:1.1 cjep_sun2x:1.1.0.42 cjep_sun2x-base:1.1 cjep_staticlib_x-base1:1.1 cjep_staticlib_x:1.1.0.40 cjep_staticlib_x-base:1.1 thorpej-futex-base:1.1 bouyer-xenpvh-base2:1.1 phil-wifi-20200421:1.1 bouyer-xenpvh-base1:1.1 phil-wifi-20200411:1.1 bouyer-xenpvh:1.1.0.38 bouyer-xenpvh-base:1.1 phil-wifi-20200406:1.1 ad-namecache-base3:1.1 ad-namecache-base2:1.1 ad-namecache-base1:1.1 ad-namecache:1.1.0.36 ad-namecache-base:1.1 isaki-audio2:1.1.0.34 isaki-audio2-base:1.1 pgoyette-compat-merge-20190127:1.1 pgoyette-compat-20190127:1.1 pgoyette-compat-20190118:1.1 pgoyette-compat-1226:1.1 pgoyette-compat-1126:1.1 pgoyette-compat-1020:1.1 pgoyette-compat-0930:1.1 pgoyette-compat-0906:1.1 pgoyette-compat-0728:1.1 pgoyette-compat-0625:1.1 pgoyette-compat-0521:1.1 pgoyette-compat-0502:1.1 pgoyette-compat-0422:1.1 pgoyette-compat-0415:1.1 pgoyette-compat-0407:1.1 pgoyette-compat-0330:1.1 pgoyette-compat-0322:1.1 pgoyette-compat-0315:1.1 pgoyette-compat:1.1.0.32 pgoyette-compat-base:1.1 perseant-stdc-iso10646:1.1.0.30 perseant-stdc-iso10646-base:1.1 prg-localcount2-base3:1.1 prg-localcount2-base2:1.1 prg-localcount2-base1:1.1 prg-localcount2:1.1.0.28 prg-localcount2-base:1.1 pgoyette-localcount-20170426:1.1 bouyer-socketcan-base1:1.1 pgoyette-localcount-20170320:1.1 bouyer-socketcan:1.1.0.26 bouyer-socketcan-base:1.1 pgoyette-localcount-20170107:1.1 pgoyette-localcount-20161104:1.1 localcount-20160914:1.1 pgoyette-localcount-20160806:1.1 pgoyette-localcount-20160726:1.1 pgoyette-localcount:1.1.0.24 pgoyette-localcount-base:1.1 netbsd-5-2-3-RELEASE:1.1.2.2 netbsd-5-1-5-RELEASE:1.1.2.2 yamt-pagecache-base9:1.1 yamt-pagecache-tag8:1.1 tls-earlyentropy:1.1.0.22 tls-earlyentropy-base:1.1 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1 riastradh-drm2-base3:1.1 netbsd-5-2-2-RELEASE:1.1.2.2 netbsd-5-1-4-RELEASE:1.1.2.2 netbsd-5-2-1-RELEASE:1.1.2.2 netbsd-5-1-3-RELEASE:1.1.2.2 rmind-smpnet-nbase:1.1 rmind-smpnet:1.1.0.18 rmind-smpnet-base:1.1 agc-symver:1.1.0.20 agc-symver-base:1.1 tls-maxphys-base:1.1 yamt-pagecache-base8:1.1 netbsd-5-2:1.1.2.2.0.6 yamt-pagecache-base7:1.1 netbsd-5-2-RELEASE:1.1.2.2 netbsd-5-2-RC1:1.1.2.2 yamt-pagecache-base6:1.1 yamt-pagecache-base5:1.1 yamt-pagecache-base4:1.1 netbsd-5-1-2-RELEASE:1.1.2.2 netbsd-5-1-1-RELEASE:1.1.2.2 jmcneill-usbmp:1.1.0.16 jmcneill-usbmp-base:1.1 jmcneill-audiomp3:1.1.0.14 jmcneill-audiomp3-base:1.1 yamt-pagecache-base3:1.1 yamt-pagecache-base2:1.1 yamt-pagecache:1.1.0.12 yamt-pagecache-base:1.1 rmind-uvmplock-nbase:1.1 bouyer-quota2-nbase:1.1 bouyer-quota2:1.1.0.10 bouyer-quota2-base:1.1 jruoho-x86intr:1.1.0.8 jruoho-x86intr-base:1.1 matt-nb5-pq3:1.1.2.2.0.4 matt-nb5-pq3-base:1.1.2.2 netbsd-5-1:1.1.2.2.0.2 netbsd-5-1-RELEASE:1.1.2.2 yamt-nfs-mp-base11:1.1 netbsd-5-1-RC4:1.1.2.2 uebayasi-xip-base2:1.1 yamt-nfs-mp-base10:1.1 netbsd-5-1-RC3:1.1.2.2 netbsd-5-1-RC2:1.1.2.2 netbsd-5-1-RC1:1.1.2.2 rmind-uvmplock:1.1.0.6 rmind-uvmplock-base:1.1 yamt-nfs-mp-base9:1.1 uebayasi-xip:1.1.0.4 uebayasi-xip-base:1.1 yamt-nfs-mp-base8:1.1 yamt-nfs-mp-base7:1.1 jymxensuspend-base:1.1 yamt-nfs-mp-base6:1.1 jym-xensuspend-nbase:1.1 netbsd-5:1.1.0.2; locks; strict; comment @# @; 1.1 date 2009.06.20.23.42.50; author snj; state dead; branches 1.1.2.1; next ; 1.1.2.1 date 2009.06.20.23.42.50; author snj; state Exp; branches; next 1.1.2.2; 1.1.2.2 date 2009.06.21.00.31.27; author snj; state dead; branches; next ; desc @@ 1.1 log @file Makefile was initially added on branch netbsd-5. @ text @@ 1.1.2.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 @a0 33 # $FreeBSD$ .PATH: ${.CURDIR}/.. KMOD = nouveau NO_MAN = YES SRCS = nouveau_drv.c nouveau_state.c nouveau_mem.c nouveau_object.c \ nouveau_sgdma.c nouveau_fifo.c nouveau_notifier.c nouveau_dma.c \ nouveau_irq.c nouveau_swmthd.c \ nv04_timer.c \ nv04_mc.c nv40_mc.c nv50_mc.c \ nv04_fb.c nv10_fb.c nv40_fb.c \ nv04_fifo.c nv10_fifo.c nv40_fifo.c nv50_fifo.c \ nv04_graph.c nv10_graph.c nv20_graph.c \ nv40_graph.c nv50_graph.c \ nv04_instmem.c nv50_instmem.c # nouveau_bo.c nouveau_fence.c \ SRCS += device_if.h bus_if.h pci_if.h opt_drm.h CFLAGS += ${DEBUG_FLAGS} -I. -I.. .if defined(DRM_DEBUG) DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" .endif .if !defined(DRM_NOLINUX) DRM_LINUX_OPT= "\#define DRM_LINUX 1" .endif opt_drm.h: touch opt_drm.h echo $(DRM_DEBUG_OPT) >> opt_drm.h echo $(DRM_LINUX_OPT) >> opt_drm.h .include @ 1.1.2.2 log @Move a number of files to their proper locations. @ text @@