Module Name: src Committed By: snj Date: Sun Sep 21 17:41:53 UTC 2014
Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau [netbsd-7]: nouveau_bo.c nouveau_drm.c nouveau_drm.h nouveau_fence.c nouveau_gem.c nouveau_nv10_fence.c nouveau_nv50_display.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine [netbsd-7]: nouveau_engine_xtensa.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/copy [netbsd-7]: nouveau_engine_copy_nva3.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/crypt [netbsd-7]: nouveau_engine_crypt_nv84.c nouveau_engine_crypt_nv98.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device [netbsd-7]: nouveau_engine_device_base.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp [netbsd-7]: nouveau_engine_disp_dacnv50.c nouveau_engine_disp_nv04.c nouveau_engine_disp_nv50.c nouveau_engine_disp_nvd0.c nv50.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo [netbsd-7]: nouveau_engine_fifo_base.c nouveau_engine_fifo_nvc0.c nouveau_engine_fifo_nve0.c nve0.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph [netbsd-7]: nouveau_engine_graph_ctxnvd7.c nouveau_engine_graph_gm107.c nouveau_engine_graph_nv50.c nouveau_engine_graph_nvc0.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmon [netbsd-7]: nouveau_engine_perfmon_base.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core [netbsd-7]: device.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/engine [netbsd-7]: device.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev [netbsd-7]: bar.h fb.h pwr.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar [netbsd-7]: nouveau_subdev_bar_base.c src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem [netbsd-7]: nouveau_subdev_instmem_nv04.c nouveau_subdev_instmem_nv40.c nv04.h src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr [netbsd-7]: nouveau_subdev_pwr_base.c src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04 [netbsd-7]: nouveau_dispnv04_tvmodesnv17.c nouveau_dispnv04_tvnv17.c src/sys/external/bsd/drm2/include/drm [netbsd-7]: drm_agp_netbsd.h src/sys/external/bsd/drm2/include/linux [netbsd-7]: bitops.h i2c.h mutex.h pagemap.h pm_runtime.h spinlock.h vmalloc.h src/sys/external/bsd/drm2/nouveau [netbsd-7]: files.nouveau nouveau_module.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #95): sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/fb.h: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar/nouveau_subdev_bar_base.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/include/engine/device.h: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/nouveau_engine_xtensa.c: revision 1.2 sys/external/bsd/drm2/include/linux/bitops.h: revision 1.8 sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv17.c: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h: revision 1.3 sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h: revision 1.4 sys/external/bsd/drm2/include/linux/spinlock.h: revision 1.4 sys/external/bsd/drm2/include/linux/pm_runtime.h: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/crypt/nouveau_engine_crypt_nv98.c: revision 1.2 sys/external/bsd/drm2/nouveau/files.nouveau: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_dacnv50.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nv50.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c: revision 1.5 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmon/nouveau_engine_perfmon_base.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/crypt/nouveau_engine_crypt_nv84.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_nv50.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c: revision 1.2 sys/external/bsd/drm2/include/linux/vmalloc.h: revision 1.4 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nve0.h: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nv04.h: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_base.c: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nvd0.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nv04.c: revision 1.2 sys/external/bsd/drm2/nouveau/nouveau_module.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nouveau_subdev_instmem_nv40.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_gm107.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_ctxnvd7.c: revision 1.2 sys/external/bsd/drm2/include/linux/mutex.h: revision 1.7 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nv50.h: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c: revision 1.3 sys/external/bsd/drm2/include/linux/i2c.h: revision 1.6 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_nvc0.c: revision 1.2 sys/external/bsd/drm2/include/linux/pagemap.h: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nouveau_subdev_instmem_nv04.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/copy/nouveau_engine_copy_nva3.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c: revision 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/bar.h: revision 1.3 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr/nouveau_subdev_pwr_base.c: revision 1.2 Another round of nouveau whack-a-mole. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c cvs rdiff -u -r1.2 -r1.2.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/nouveau_engine_xtensa.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/copy/nouveau_engine_copy_nva3.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/crypt/nouveau_engine_crypt_nv84.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/crypt/nouveau_engine_crypt_nv98.c cvs rdiff -u -r1.2 -r1.2.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_dacnv50.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nv04.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nv50.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_nvd0.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nv50.h cvs rdiff -u -r1.2 -r1.2.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_base.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nve0.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_ctxnvd7.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_gm107.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_nv50.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/graph/nouveau_engine_graph_nvc0.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/perfmon/nouveau_engine_perfmon_base.c cvs rdiff -u -r1.2 -r1.2.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/engine/device.h cvs rdiff -u -r1.2 -r1.2.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/bar.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/fb.h \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar/nouveau_subdev_bar_base.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nouveau_subdev_instmem_nv04.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nouveau_subdev_instmem_nv40.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nv04.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr/nouveau_subdev_pwr_base.c cvs rdiff -u -r1.2 -r1.2.4.1 \ src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvmodesnv17.c \ src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv04/nouveau_dispnv04_tvnv17.c cvs rdiff -u -r1.3 -r1.3.2.1 \ src/sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/external/bsd/drm2/include/linux/bitops.h cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/external/bsd/drm2/include/linux/i2c.h cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/external/bsd/drm2/include/linux/mutex.h cvs rdiff -u -r1.2 -r1.2.8.1 \ src/sys/external/bsd/drm2/include/linux/pagemap.h cvs rdiff -u -r1.2 -r1.2.4.1 \ src/sys/external/bsd/drm2/include/linux/pm_runtime.h cvs rdiff -u -r1.3 -r1.3.2.1 \ src/sys/external/bsd/drm2/include/linux/spinlock.h \ src/sys/external/bsd/drm2/include/linux/vmalloc.h cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/external/bsd/drm2/nouveau/files.nouveau cvs rdiff -u -r1.1 -r1.1.4.1 \ src/sys/external/bsd/drm2/nouveau/nouveau_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.