libdrm: Changes to 'upstream-experimental'
.gitignore | 6
Makefile.am | 54
README | 85
RELEASING | 66
bsd-core/Makefile | 11
bsd-core/ati_pcigart.c | 219
bsd-core/drm.h | 1
bsd-core/drm/Makefile | 41
bsd-core/drmP.h | 1019 -
bsd-core/drm_agpsupport.c | 466
bsd-core/drm_atomic.h | 88
bsd-core/drm_auth.c | 187
bsd-core/drm_bufs.c | 1110 -
bsd-core/drm_context.c | 320
bsd-core/drm_dma.c | 136
bsd-core/drm_drawable.c | 170
bsd-core/drm_drv.c | 839 -
bsd-core/drm_fops.c | 106
bsd-core/drm_internal.h | 1
bsd-core/drm_ioctl.c | 282
bsd-core/drm_irq.c | 499
bsd-core/drm_linux_list.h | 75
bsd-core/drm_lock.c | 191
bsd-core/drm_memory.c | 110
bsd-core/drm_mode.h | 1
bsd-core/drm_pci.c | 125
bsd-core/drm_sarea.h | 1
bsd-core/drm_scatter.c | 190
bsd-core/drm_sysctl.c | 312
bsd-core/drm_vm.c | 124
bsd-core/i915/Makefile | 23
bsd-core/i915_dma.c | 1
bsd-core/i915_drm.h | 1
bsd-core/i915_drv.c | 158
bsd-core/i915_drv.h | 1
bsd-core/i915_irq.c | 1
bsd-core/i915_mem.c | 1
bsd-core/i915_reg.h | 1
bsd-core/i915_suspend.c | 1
bsd-core/mach64/Makefile | 23
bsd-core/mach64_dma.c | 1
bsd-core/mach64_drm.h | 1
bsd-core/mach64_drv.c | 135
bsd-core/mach64_drv.h | 1
bsd-core/mach64_irq.c | 1
bsd-core/mach64_state.c | 1
bsd-core/mga/Makefile | 23
bsd-core/mga_dma.c | 1
bsd-core/mga_drm.h | 1
bsd-core/mga_drv.c | 172
bsd-core/mga_drv.h | 1
bsd-core/mga_irq.c | 1
bsd-core/mga_state.c | 1
bsd-core/mga_ucode.h | 1
bsd-core/mga_warp.c | 1
bsd-core/nouveau/@ | 1
bsd-core/nouveau/Makefile | 33
bsd-core/nouveau/machine | 1
bsd-core/nouveau_dma.c | 1
bsd-core/nouveau_dma.h | 1
bsd-core/nouveau_drm.h | 1
bsd-core/nouveau_drv.c | 148
bsd-core/nouveau_drv.h | 1
bsd-core/nouveau_fifo.c | 1
bsd-core/nouveau_irq.c | 1
bsd-core/nouveau_mem.c | 1
bsd-core/nouveau_notifier.c | 1
bsd-core/nouveau_object.c | 1
bsd-core/nouveau_reg.h | 1
bsd-core/nouveau_sgdma.c | 357
bsd-core/nouveau_state.c | 1
bsd-core/nouveau_swmthd.c | 1
bsd-core/nouveau_swmthd.h | 1
bsd-core/nv04_fb.c | 1
bsd-core/nv04_fifo.c | 1
bsd-core/nv04_graph.c | 1
bsd-core/nv04_instmem.c | 1
bsd-core/nv04_mc.c | 1
bsd-core/nv04_timer.c | 1
bsd-core/nv10_fb.c | 1
bsd-core/nv10_fifo.c | 1
bsd-core/nv10_graph.c | 1
bsd-core/nv20_graph.c | 1
bsd-core/nv40_fb.c | 1
bsd-core/nv40_fifo.c | 1
bsd-core/nv40_graph.c | 1
bsd-core/nv40_mc.c | 1
bsd-core/nv50_fifo.c | 1
bsd-core/nv50_graph.c | 1
bsd-core/nv50_grctx.h | 1
bsd-core/nv50_instmem.c | 1
bsd-core/nv50_mc.c | 1
bsd-core/r128/Makefile | 23
bsd-core/r128_cce.c | 1
bsd-core/r128_drm.h | 1
bsd-core/r128_drv.c | 133
bsd-core/r128_drv.h | 1
bsd-core/r128_irq.c | 1
bsd-core/r128_state.c | 1
bsd-core/r300_cmdbuf.c | 1
bsd-core/r300_reg.h | 1
bsd-core/radeon/Makefile | 28
bsd-core/radeon_cp.c | 1
bsd-core/radeon_drm.h | 1
bsd-core/radeon_drv.c | 132
bsd-core/radeon_drv.h | 1
bsd-core/radeon_irq.c | 1
bsd-core/radeon_mem.c | 1
bsd-core/radeon_microcode.h | 1
bsd-core/radeon_state.c | 1
bsd-core/savage/Makefile | 23
bsd-core/savage_bci.c | 1
bsd-core/savage_drm.h | 1
bsd-core/savage_drv.c | 118
bsd-core/savage_drv.h | 1
bsd-core/savage_state.c | 1
bsd-core/sis/Makefile | 23
bsd-core/sis_drm.h | 1
bsd-core/sis_drv.c | 112
bsd-core/sis_drv.h | 1
bsd-core/sis_ds.c | 1
bsd-core/sis_ds.h | 1
bsd-core/sis_mm.c | 1
bsd-core/tdfx/Makefile | 23
bsd-core/tdfx_drv.c | 114
bsd-core/tdfx_drv.h | 1
bsd-core/via/Makefile | 24
bsd-core/via_3d_reg.h | 1
bsd-core/via_dma.c | 1
bsd-core/via_drm.h | 1
bsd-core/via_drv.c | 121
bsd-core/via_drv.h | 1
bsd-core/via_ds.c | 1
bsd-core/via_ds.h | 1
bsd-core/via_irq.c | 1
bsd-core/via_map.c | 1
bsd-core/via_mm.c | 1
bsd-core/via_mm.h | 1
bsd-core/via_verifier.c | 1
bsd-core/via_verifier.h | 1
bsd-core/via_video.c | 1
configure.ac | 136
include/Makefile.am | 1
include/drm/Makefile.am | 43
include/drm/drm.h | 787 +
include/drm/drm_mode.h | 318
include/drm/drm_sarea.h | 82
include/drm/i810_drm.h | 281
include/drm/i830_drm.h | 342
include/drm/i915_drm.h | 815 +
include/drm/mach64_drm.h | 256
include/drm/mga_drm.h | 419
include/drm/nouveau_drm.h | 199
include/drm/r128_drm.h | 326
include/drm/radeon_drm.h | 912 +
include/drm/savage_drm.h | 210
include/drm/sis_drm.h | 67
include/drm/via_drm.h | 275
include/drm/vmwgfx_drm.h | 545
intel/Makefile.am | 49
intel/intel_bufmgr.c | 256
intel/intel_bufmgr.h | 218
intel/intel_bufmgr_fake.c | 1615 ++
intel/intel_bufmgr_gem.c | 2091 +++
intel/intel_bufmgr_priv.h | 273
intel/intel_chipset.h | 101
intel/libdrm_intel.pc.in | 11
intel/mm.c | 271
intel/mm.h | 94
libdrm.pc.in | 2
libdrm/ChangeLog | 20
libdrm/Makefile.am | 40
libdrm/TODO | 10
libdrm/intel/Makefile.am | 47
libdrm/intel/intel_bufmgr.c | 214
libdrm/intel/intel_bufmgr.h | 193
libdrm/intel/intel_bufmgr_fake.c | 1528 --
libdrm/intel/intel_bufmgr_gem.c | 1443 --
libdrm/intel/intel_bufmgr_priv.h | 185
libdrm/intel/intel_chipset.h | 71
libdrm/intel/mm.c | 281
libdrm/intel/mm.h | 96
libdrm/libdrm_lists.h | 89
libdrm/nouveau/Makefile.am | 42
libdrm/nouveau/libdrm_nouveau.pc.in | 10
libdrm/nouveau/nouveau_bo.c | 848 -
libdrm/nouveau/nouveau_bo.h | 97
libdrm/nouveau/nouveau_channel.c | 178
libdrm/nouveau/nouveau_channel.h | 56
libdrm/nouveau/nouveau_class.h | 8006 -------------
libdrm/nouveau/nouveau_device.c | 202
libdrm/nouveau/nouveau_device.h | 31
libdrm/nouveau/nouveau_dma.c | 216
libdrm/nouveau/nouveau_dma.h | 154
libdrm/nouveau/nouveau_drmif.h | 62
libdrm/nouveau/nouveau_fence.c | 243
libdrm/nouveau/nouveau_grobj.c | 138
libdrm/nouveau/nouveau_grobj.h | 48
libdrm/nouveau/nouveau_notifier.c | 146
libdrm/nouveau/nouveau_notifier.h | 63
libdrm/nouveau/nouveau_private.h | 203
libdrm/nouveau/nouveau_pushbuf.c | 276
libdrm/nouveau/nouveau_pushbuf.h | 160
libdrm/nouveau/nouveau_resource.c | 115
libdrm/nouveau/nouveau_resource.h | 48
libdrm/xf86drm.c | 2481 ----
libdrm/xf86drm.h | 670 -
libdrm/xf86drmHash.c | 428
libdrm/xf86drmMode.c | 665 -
libdrm/xf86drmMode.h | 364
libdrm/xf86drmRandom.c | 208
libdrm/xf86drmSL.c | 480
libdrm/xf86mm.h | 198
libdrm_intel.pc.in | 10
libdrm_lists.h | 89
libkms/Makefile.am | 34
libkms/api.c | 138
libkms/intel.c | 238
libkms/internal.h | 73
libkms/libkms.h | 74
libkms/libkms.pc.in | 10
libkms/linux.c | 219
libkms/nouveau.c | 220
libkms/vmwgfx.c | 207
linux-core/.gitignore | 1
linux-core/Config.in | 17
linux-core/Doxyfile | 1161 -
linux-core/Kconfig | 83
linux-core/Makefile | 336
linux-core/Makefile.kernel | 64
linux-core/README.drm | 25
linux-core/ati_pcigart.c | 199
linux-core/drm-gem.txt | 805 -
linux-core/drm.h | 1
linux-core/drmP.h | 1501 --
linux-core/drm_agpsupport.c | 680 -
linux-core/drm_auth.c | 189
linux-core/drm_bo.c | 2730 ----
linux-core/drm_bo_lock.c | 189
linux-core/drm_bo_move.c | 614 -
linux-core/drm_bufs.c | 1608 --
linux-core/drm_compat.c | 252
linux-core/drm_compat.h | 221
linux-core/drm_context.c | 472
linux-core/drm_core.h | 35
linux-core/drm_dma.c | 179
linux-core/drm_drawable.c | 192
linux-core/drm_drv.c | 691 -
linux-core/drm_fence.c | 829 -
linux-core/drm_fops.c | 532
linux-core/drm_gem.c | 444
linux-core/drm_hashtab.c | 202
linux-core/drm_hashtab.h | 67
linux-core/drm_internal.h | 1
linux-core/drm_ioc32.c | 1073 -
linux-core/drm_ioctl.c | 351
linux-core/drm_irq.c | 769 -
linux-core/drm_lock.c | 389
linux-core/drm_memory.c | 366
linux-core/drm_memory.h | 61
linux-core/drm_memory_debug.c | 399
linux-core/drm_memory_debug.h | 379
linux-core/drm_mm.c | 298
linux-core/drm_mode.h | 1
linux-core/drm_object.c | 294
linux-core/drm_objects.h | 821 -
linux-core/drm_os_linux.h | 131
linux-core/drm_pci.c | 177
linux-core/drm_proc.c | 743 -
linux-core/drm_regman.c | 200
linux-core/drm_sarea.h | 1
linux-core/drm_scatter.c | 228
linux-core/drm_sman.c | 353
linux-core/drm_sman.h | 176
linux-core/drm_stub.c | 389
linux-core/drm_sysfs.c | 212
linux-core/drm_ttm.c | 512
linux-core/drm_vm.c | 870 -
linux-core/drm_vm_nopage_compat.c | 267
linux-core/ffb_context.c | 582 -
linux-core/ffb_drv.c | 329
linux-core/ffb_drv.h | 284
linux-core/i810_dma.c | 1301 --
linux-core/i810_drm.h | 263
linux-core/i810_drv.c | 104
linux-core/i810_drv.h | 242
linux-core/imagine_drv.c | 85
linux-core/linux | 1
linux-core/mach64_dma.c | 1
linux-core/mach64_drm.h | 1
linux-core/mach64_drv.c | 105
linux-core/mach64_drv.h | 1
linux-core/mach64_irq.c | 1
linux-core/mach64_state.c | 1
linux-core/mga_dma.c | 1
linux-core/mga_drm.h | 1
linux-core/mga_drv.c | 152
linux-core/mga_drv.h | 1
linux-core/mga_ioc32.c | 234
linux-core/mga_irq.c | 1
linux-core/mga_state.c | 1
linux-core/mga_ucode.h | 1
linux-core/mga_warp.c | 1
linux-core/nouveau_backlight.c | 175
linux-core/nouveau_bo.c | 296
linux-core/nouveau_dma.c | 1
linux-core/nouveau_dma.h | 1
linux-core/nouveau_drm.h | 1
linux-core/nouveau_drv.c | 120
linux-core/nouveau_drv.h | 1
linux-core/nouveau_fence.c | 119
linux-core/nouveau_fifo.c | 1
linux-core/nouveau_ioc32.c | 72
linux-core/nouveau_irq.c | 1
linux-core/nouveau_mem.c | 1
linux-core/nouveau_notifier.c | 1
linux-core/nouveau_object.c | 1
linux-core/nouveau_reg.h | 1
linux-core/nouveau_sgdma.c | 345
linux-core/nouveau_state.c | 1
linux-core/nouveau_swmthd.c | 1
linux-core/nouveau_swmthd.h | 1
linux-core/nv04_fb.c | 1
linux-core/nv04_fifo.c | 1
linux-core/nv04_graph.c | 1
linux-core/nv04_instmem.c | 1
linux-core/nv04_mc.c | 1
linux-core/nv04_timer.c | 1
linux-core/nv10_fb.c | 1
linux-core/nv10_fifo.c | 1
linux-core/nv10_graph.c | 1
linux-core/nv20_graph.c | 1
linux-core/nv40_fb.c | 1
linux-core/nv40_fifo.c | 1
linux-core/nv40_graph.c | 1
linux-core/nv40_mc.c | 1
linux-core/nv50_fifo.c | 1
linux-core/nv50_graph.c | 1
linux-core/nv50_grctx.h | 1
linux-core/nv50_instmem.c | 1
linux-core/nv50_mc.c | 1
linux-core/r128_cce.c | 1
linux-core/r128_drm.h | 1
linux-core/r128_drv.c | 113
linux-core/r128_drv.h | 1
linux-core/r128_ioc32.c | 222
linux-core/r128_irq.c | 1
linux-core/r128_state.c | 1
linux-core/r300_cmdbuf.c | 1
linux-core/r300_reg.h | 1
linux-core/radeon_cp.c | 1
linux-core/radeon_drm.h | 1
linux-core/radeon_drv.c | 157
linux-core/radeon_drv.h | 1
linux-core/radeon_ioc32.c | 424
linux-core/radeon_irq.c | 1
linux-core/radeon_mem.c | 1
linux-core/radeon_microcode.h | 1
linux-core/radeon_state.c | 1
linux-core/savage_bci.c | 1
linux-core/savage_drm.h | 1
linux-core/savage_drv.c | 96
linux-core/savage_drv.h | 1
linux-core/savage_state.c | 1
linux-core/sis_drm.h | 1
linux-core/sis_drv.c | 127
linux-core/sis_drv.h | 1
linux-core/sis_mm.c | 332
linux-core/tdfx_drv.c | 93
linux-core/tdfx_drv.h | 1
linux-core/via_3d_reg.h | 1
linux-core/via_buffer.c | 163
linux-core/via_dma.c | 1
linux-core/via_dmablit.c | 817 -
linux-core/via_dmablit.h | 140
linux-core/via_drm.h | 1
linux-core/via_drv.c | 1
linux-core/via_drv.h | 1
linux-core/via_fence.c | 169
linux-core/via_irq.c | 1
linux-core/via_map.c | 1
linux-core/via_mm.c | 196
linux-core/via_verifier.c | 1
linux-core/via_verifier.h | 1
linux-core/via_video.c | 1
linux-core/xgi_cmdlist.c | 328
linux-core/xgi_cmdlist.h | 66
linux-core/xgi_drm.h | 1
linux-core/xgi_drv.c | 441
linux-core/xgi_drv.h | 130
linux-core/xgi_fb.c | 130
linux-core/xgi_fence.c | 186
linux-core/xgi_ioc32.c | 140
linux-core/xgi_misc.c | 477
linux-core/xgi_misc.h | 37
linux-core/xgi_pcie.c | 127
linux-core/xgi_regs.h | 169
nouveau/Makefile.am | 41
nouveau/libdrm_nouveau.pc.in | 11
nouveau/nouveau_bo.c | 541
nouveau/nouveau_bo.h | 98
nouveau/nouveau_channel.c | 136
nouveau/nouveau_channel.h | 57
nouveau/nouveau_device.c | 188
nouveau/nouveau_device.h | 33
nouveau/nouveau_drmif.h | 57
nouveau/nouveau_grobj.c | 138
nouveau/nouveau_grobj.h | 48
nouveau/nouveau_notifier.c | 146
nouveau/nouveau_notifier.h | 63
nouveau/nouveau_private.h | 135
nouveau/nouveau_pushbuf.c | 343
nouveau/nouveau_pushbuf.h | 200
nouveau/nouveau_reloc.c | 138
nouveau/nouveau_reloc.h | 32
nouveau/nouveau_resource.c | 124
nouveau/nouveau_resource.h | 51
radeon/Makefile.am | 57
radeon/bof.c | 477
radeon/bof.h | 90
radeon/libdrm_radeon.pc.in | 10
radeon/radeon_bo.c | 141
radeon/radeon_bo.h | 74
radeon/radeon_bo_gem.c | 351
radeon/radeon_bo_gem.h | 44
radeon/radeon_bo_int.h | 45
radeon/radeon_cs.c | 96
radeon/radeon_cs.h | 141
radeon/radeon_cs_gem.c | 548
radeon/radeon_cs_gem.h | 41
radeon/radeon_cs_int.h | 67
radeon/radeon_cs_space.c | 242
scripts/create_bsd_pci_lists.sh | 40
scripts/create_linux_pci_lists.sh | 40
scripts/create_lk_drm.sh | 37
scripts/create_lk_gpu.sh | 58
scripts/drm-scripts-gentree.pl | 254
shared-core/Makefile.am | 41
shared-core/drm.h | 1173 --
shared-core/drm_internal.h | 40
shared-core/drm_mode.h | 273
shared-core/drm_pciids.txt | 594 -
shared-core/drm_sarea.h | 84
shared-core/i915_dma.c | 1030 -
shared-core/i915_drm.h | 772 -
shared-core/i915_drv.h | 667 -
shared-core/i915_irq.c | 534
shared-core/i915_mem.c | 386
shared-core/i915_reg.h | 1422 --
shared-core/i915_suspend.c | 520
shared-core/imagine_drv.h | 43
shared-core/mach64_dma.c | 1778 ---
shared-core/mach64_drm.h | 256
shared-core/mach64_drv.h | 860 -
shared-core/mach64_irq.c | 159
shared-core/mach64_state.c | 910 -
shared-core/mga_dma.c | 1169 --
shared-core/mga_drm.h | 425
shared-core/mga_drv.h | 691 -
shared-core/mga_irq.c | 177
shared-core/mga_state.c | 1139 -
shared-core/mga_ucode.h |11645 --------------------
shared-core/mga_warp.c | 198
shared-core/nouveau_dma.c | 173
shared-core/nouveau_dma.h | 96
shared-core/nouveau_drm.h | 299
shared-core/nouveau_drv.h | 626 -
shared-core/nouveau_fifo.c | 602 -
shared-core/nouveau_irq.c | 588 -
shared-core/nouveau_mem.c | 910 -
shared-core/nouveau_notifier.c | 165
shared-core/nouveau_object.c | 1173 --
shared-core/nouveau_reg.h | 597 -
shared-core/nouveau_state.c | 897 -
shared-core/nouveau_swmthd.c | 191
shared-core/nouveau_swmthd.h | 33
shared-core/nv04_fb.c | 23
shared-core/nv04_fifo.c | 138
shared-core/nv04_graph.c | 516
shared-core/nv04_instmem.c | 159
shared-core/nv04_mc.c | 22
shared-core/nv04_timer.c | 53
shared-core/nv10_fb.c | 25
shared-core/nv10_fifo.c | 169
shared-core/nv10_graph.c | 914 -
shared-core/nv20_graph.c | 913 -
shared-core/nv40_fb.c | 62
shared-core/nv40_fifo.c | 209
shared-core/nv40_graph.c | 2190 ---
shared-core/nv40_mc.c | 38
shared-core/nv50_fifo.c | 343
shared-core/nv50_graph.c | 337
shared-core/nv50_grctx.h |20935 ------------------------------------
shared-core/nv50_instmem.c | 331
shared-core/nv50_mc.c | 43
shared-core/r128_cce.c | 933 -
shared-core/r128_drm.h | 326
shared-core/r128_drv.h | 526
shared-core/r128_irq.c | 116
shared-core/r128_state.c | 1681 --
shared-core/r300_cmdbuf.c | 1198 --
shared-core/r300_reg.h | 1778 ---
shared-core/r600_microcode.h |14275 ------------------------
shared-core/radeon_cp.c | 1793 ---
shared-core/radeon_drm.h | 750 -
shared-core/radeon_drv.h | 1470 --
shared-core/radeon_irq.c | 415
shared-core/radeon_mem.c | 302
shared-core/radeon_microcode.h | 1844 ---
shared-core/radeon_state.c | 3263 -----
shared-core/savage_bci.c | 1092 -
shared-core/savage_drm.h | 209
shared-core/savage_drv.h | 575
shared-core/savage_state.c | 1165 --
shared-core/sis_drm.h | 67
shared-core/sis_drv.h | 90
shared-core/sis_ds.c | 299
shared-core/sis_ds.h | 146
shared-core/sis_mm.c | 386
shared-core/tdfx_drv.h | 47
shared-core/via_3d_reg.h | 1650 --
shared-core/via_dma.c | 763 -
shared-core/via_drm.h | 282
shared-core/via_drv.c | 157
shared-core/via_drv.h | 211
shared-core/via_ds.c | 274
shared-core/via_ds.h | 104
shared-core/via_irq.c | 402
shared-core/via_map.c | 149
shared-core/via_mm.c | 347
shared-core/via_mm.h | 40
shared-core/via_verifier.c | 1121 -
shared-core/via_verifier.h | 62
shared-core/via_video.c | 93
shared-core/xgi_drm.h | 137
tests/Makefile.am | 36
tests/dristat.c | 3
tests/drmstat.c | 10
tests/drmtest.c | 4
tests/kmstest/Makefile.am | 17
tests/kmstest/main.c | 91
tests/modeprint/Makefile.am | 10
tests/modeprint/modeprint.c | 12
tests/modetest/Makefile.am | 10
tests/modetest/modetest.c | 222
tests/name_from_fd.c | 58
xf86atomic.h | 99
xf86drm.c | 2527 ++++
xf86drm.h | 722 +
xf86drmHash.c | 428
xf86drmMode.c | 814 +
xf86drmMode.h | 388
xf86drmRandom.c | 208
xf86drmSL.c | 477
xf86mm.h | 198
555 files changed, 23717 insertions(+), 165520 deletions(-)
New commits:
commit 3506173ba7e726a9d0a17ec42734a925a885b01e
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Apr 11 18:40:38 2010 +0100
intel: Use the correct size when allocating reloc_target_info array
Thomas tracked down this error with kdm and commit b509640:
==4320== Invalid write of size 8
==4320== at 0x9A97998: do_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
==4320== by 0x9A97B9C: drm_intel_gem_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
==4320== by 0xAED3234: intel_batchbuffer_emit_reloc (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF13827: brw_emit_vertices (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF1F14D: brw_upload_state (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF12122: brw_draw_prims (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xB256824: vbo_exec_vtx_flush (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0xB2523BB: vbo_exec_FlushVertices_internal (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0xB252411: vbo_exec_FlushVertices (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0xB195A3D: _mesa_PopAttrib (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0x8DF0F02: __glXDisp_Render (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== by 0x8DF517F: __glXDispatch (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== Address 0x126a8b80 is 0 bytes after a block of size 16,368 alloc'd
==4320== at 0x4C23E03: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==4320== by 0x9A97A64: do_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
==4320== by 0x9A97B9C: drm_intel_gem_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
==4320== by 0xAED3234: intel_batchbuffer_emit_reloc (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF191DB: upload_binding_table_pointers (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF1F14D: brw_upload_state (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF12122: brw_draw_prims (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xB255EF6: vbo_exec_DrawArrays (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0x8DF67A3: __glXDisp_DrawArrays (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== by 0x8DF0F02: __glXDisp_Render (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== by 0x8DF517F: __glXDispatch (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== by 0x446293: ??? (in /usr/bin/Xorg)
which is simply due to only allocating space for the pointers and not
the structs themselves. D'oh.
Reported-by: Thomas Bächler <thomas@archlinux.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 8e46e37..a2cf6e6 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -470,7 +470,7 @@ drm_intel_setup_reloc_list(drm_intel_bo *bo)
bo_gem->relocs = malloc(max_relocs *
sizeof(struct drm_i915_gem_relocation_entry));
bo_gem->reloc_target_info = malloc(max_relocs *
- sizeof(drm_intel_reloc_target *));
+ sizeof(drm_intel_reloc_target));
if (bo_gem->relocs == NULL || bo_gem->reloc_target_info == NULL) {
bo_gem->has_error = 1;
commit 894c86e8400f13f1ee0dfe23ca4b5f98c32d9223
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 9 16:33:38 2010 -0400
Revert "Fix pkgconfig includes for /usr/include/drm"
This reverts commit 245d6957794648d7fd83279c680fed6e4c262147.
libdrm now install headers in ${includedir}/libdrm and /usr/include/drm
is reserved for the kernel headers. We should only ever add one of these
to the CFLAGS.
diff --git a/libdrm.pc.in b/libdrm.pc.in
index b218d12..b46e2a6 100644
--- a/libdrm.pc.in
+++ b/libdrm.pc.in
@@ -7,4 +7,4 @@ Name: libdrm
Description: Userspace interface to kernel DRM services
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -ldrm
-Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/libdrm
+Cflags: -I${includedir} -I${includedir}/libdrm
commit 204c76c4d62c06eceacd9d603f2bc3e2f8e84270
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Fri Apr 9 20:38:34 2010 +1000
nouveau: stop shipping nouveau_class.h
The motivation behind this is that by shipping it here, it's essentially
an API which causes issues while bisecting across changes to the header
files.
diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am
index b6d214a..de3f4df 100644
--- a/nouveau/Makefile.am
+++ b/nouveau/Makefile.am
@@ -30,7 +30,6 @@ libdrm_nouveaucommoninclude_HEADERS = \
nouveau_pushbuf.h \
nouveau_bo.h \
nouveau_resource.h \
- nouveau_class.h \
nouveau_reloc.h
diff --git a/nouveau/nouveau_class.h b/nouveau/nouveau_class.h
deleted file mode 100644
index 0167cbc..0000000
--- a/nouveau/nouveau_class.h
+++ /dev/null
@@ -1,9019 +0,0 @@
-/*************************************************************************
-
- Autogenerated file, do not edit !
-
- This file was generated by renouveau-gen from renouveau.xml, the
- XML database of nvidia objects and methods. renouveau-gen and
- renouveau.xml can be found in CVS module renouveau of sourceforge.net
- project nouveau:
-
-cvs -z3 -d:pserver:anonymous@nouveau.cvs.sourceforge.net:/cvsroot/nouveau co -P renouveau
-
-**************************************************************************
-
- Copyright (C) 2006-2008 :
- Dmitry Baryshkov,
- Laurent Carlier,
- Matthieu Castet,
- Dawid Gajownik,
- Jeremy Kolb,
- Stephane Loeuillet,
- Patrice Mandin,
- Stephane Marchesin,
- Serge Martin,
- Sylvain Munaut,
- Simon Raffeiner,
- Ben Skeggs,
- Erik Waling,
- koala_br,
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************/
-
-
-#ifndef NOUVEAU_REG_H
-#define NOUVEAU_REG_H 1
-
-
-#define NV01_ROOT 0x00000001
-
-
-
-#define NV01_CONTEXT_DMA 0x00000002
-
-
-
-#define NV01_DEVICE 0x00000003
-
-
-
-#define NV01_TIMER 0x00000004
-
-#define NV01_TIMER_SYNCHRONIZE 0x00000100
-#define NV01_TIMER_STOP_ALARM 0x00000104
-#define NV01_TIMER_DMA_NOTIFY 0x00000180
-#define NV01_TIMER_TIME(x) (0x00000300+((x)*4))
-#define NV01_TIMER_TIME__SIZE 0x00000002
-#define NV01_TIMER_ALARM_NOTIFY 0x00000308
-
-
-#define NV01_CONTEXT_BETA1 0x00000012
-
-#define NV01_CONTEXT_BETA1_NOP 0x00000100
-#define NV01_CONTEXT_BETA1_NOTIFY 0x00000104
-#define NV01_CONTEXT_BETA1_DMA_NOTIFY 0x00000180
-#define NV01_CONTEXT_BETA1_BETA_1D31 0x00000300
-
-
-#define NV01_CONTEXT_COLOR_KEY 0x00000017
-
-#define NV01_CONTEXT_COLOR_KEY_NOP 0x00000100
-#define NV01_CONTEXT_COLOR_KEY_NOTIFY 0x00000104
-#define NV01_CONTEXT_COLOR_KEY_DMA_NOTIFY 0x00000180
-#define NV01_CONTEXT_COLOR_KEY_COLOR_FORMAT 0x00000300
-#define NV01_CONTEXT_COLOR_KEY_COLOR_FORMAT_X16A8Y8 0x00000001
-#define NV01_CONTEXT_COLOR_KEY_COLOR_FORMAT_X24Y8 0x00000002
-#define NV01_CONTEXT_COLOR_KEY_COLOR_FORMAT_X16A1R5G5B5 0x00000003
-#define NV01_CONTEXT_COLOR_KEY_COLOR_FORMAT_X17R5G5B5 0x00000004
-#define NV01_CONTEXT_COLOR_KEY_COLOR_FORMAT_A8R8G8B8 0x00000005
-#define NV01_CONTEXT_COLOR_KEY_COLOR_FORMAT_X8R8G8B8 0x00000006
-#define NV01_CONTEXT_COLOR_KEY_COLOR_FORMAT_A16Y16 0x00000007
-#define NV01_CONTEXT_COLOR_KEY_COLOR_FORMAT_X16Y16 0x00000008
-#define NV01_CONTEXT_COLOR_KEY_COLOR 0x00000304
-
-
-#define NV04_CONTEXT_COLOR_KEY 0x00000057
-
-
-
-#define NV01_CONTEXT_PATTERN 0x00000018
-
-#define NV01_CONTEXT_PATTERN_NOP 0x00000100
-#define NV01_CONTEXT_PATTERN_NOTIFY 0x00000104
-#define NV01_CONTEXT_PATTERN_DMA_NOTIFY 0x00000180
-#define NV01_CONTEXT_PATTERN_COLOR_FORMAT 0x00000300
-#define NV01_CONTEXT_PATTERN_MONOCHROME_FORMAT 0x00000304
-#define NV01_CONTEXT_PATTERN_SHAPE 0x00000308
-#define NV01_CONTEXT_PATTERN_COLOR(x) (0x00000310+((x)*4))
-#define NV01_CONTEXT_PATTERN_COLOR__SIZE 0x00000002
-#define NV01_CONTEXT_PATTERN_PATTERN(x) (0x00000318+((x)*4))
-#define NV01_CONTEXT_PATTERN_PATTERN__SIZE 0x00000002
-
-
-#define NV01_CONTEXT_CLIP_RECTANGLE 0x00000019
-
-#define NV01_CONTEXT_CLIP_RECTANGLE_NOP 0x00000100
-#define NV01_CONTEXT_CLIP_RECTANGLE_NOTIFY 0x00000104
-#define NV01_CONTEXT_CLIP_RECTANGLE_DMA_NOTIFY 0x00000180
-#define NV01_CONTEXT_CLIP_RECTANGLE_POINT 0x00000300
-#define NV01_CONTEXT_CLIP_RECTANGLE_POINT_X_SHIFT 0
-#define NV01_CONTEXT_CLIP_RECTANGLE_POINT_X_MASK 0x0000ffff
-#define NV01_CONTEXT_CLIP_RECTANGLE_POINT_Y_SHIFT 16
-#define NV01_CONTEXT_CLIP_RECTANGLE_POINT_Y_MASK 0xffff0000
-#define NV01_CONTEXT_CLIP_RECTANGLE_SIZE 0x00000304
-#define NV01_CONTEXT_CLIP_RECTANGLE_SIZE_W_SHIFT 0
-#define NV01_CONTEXT_CLIP_RECTANGLE_SIZE_W_MASK 0x0000ffff
-#define NV01_CONTEXT_CLIP_RECTANGLE_SIZE_H_SHIFT 16
-#define NV01_CONTEXT_CLIP_RECTANGLE_SIZE_H_MASK 0xffff0000
-
-
-#define NV01_RENDER_SOLID_LINE 0x0000001c
-
-#define NV01_RENDER_SOLID_LINE_NOP 0x00000100
-#define NV01_RENDER_SOLID_LINE_NOTIFY 0x00000104
-#define NV01_RENDER_SOLID_LINE_PATCH 0x0000010c
-#define NV01_RENDER_SOLID_LINE_DMA_NOTIFY 0x00000180
-#define NV01_RENDER_SOLID_LINE_CLIP_RECTANGLE 0x00000184
-#define NV01_RENDER_SOLID_LINE_PATTERN 0x00000188
-#define NV01_RENDER_SOLID_LINE_ROP 0x0000018c
-#define NV01_RENDER_SOLID_LINE_BETA1 0x00000190
-#define NV01_RENDER_SOLID_LINE_SURFACE 0x00000194
-#define NV01_RENDER_SOLID_LINE_OPERATION 0x000002fc
-#define NV01_RENDER_SOLID_LINE_OPERATION_SRCCOPY_AND 0x00000000
-#define NV01_RENDER_SOLID_LINE_OPERATION_ROP_AND 0x00000001
-#define NV01_RENDER_SOLID_LINE_OPERATION_BLEND_AND 0x00000002
-#define NV01_RENDER_SOLID_LINE_OPERATION_SRCCOPY 0x00000003
-#define NV01_RENDER_SOLID_LINE_OPERATION_SRCCOPY_PREMULT 0x00000004
-#define NV01_RENDER_SOLID_LINE_OPERATION_BLEND_PREMULT 0x00000005
-#define NV01_RENDER_SOLID_LINE_COLOR_FORMAT 0x00000300
-#define NV01_RENDER_SOLID_LINE_COLOR_FORMAT_X16A8Y8 0x00000001
-#define NV01_RENDER_SOLID_LINE_COLOR_FORMAT_X24Y8 0x00000002
-#define NV01_RENDER_SOLID_LINE_COLOR_FORMAT_X16A1R5G5B5 0x00000003
-#define NV01_RENDER_SOLID_LINE_COLOR_FORMAT_X17R5G5B5 0x00000004
-#define NV01_RENDER_SOLID_LINE_COLOR_FORMAT_A8R8G8B8 0x00000005
-#define NV01_RENDER_SOLID_LINE_COLOR_FORMAT_X8R8G8B8 0x00000006
-#define NV01_RENDER_SOLID_LINE_COLOR_FORMAT_A16Y16 0x00000007
-#define NV01_RENDER_SOLID_LINE_COLOR_FORMAT_X16Y16 0x00000008
-#define NV01_RENDER_SOLID_LINE_COLOR 0x00000304
-#define NV01_RENDER_SOLID_LINE_LINE_POINT0(x) (0x00000400+((x)*8))
-#define NV01_RENDER_SOLID_LINE_LINE_POINT0__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_LINE_POINT0_X_SHIFT 0
-#define NV01_RENDER_SOLID_LINE_LINE_POINT0_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_LINE_LINE_POINT0_Y_SHIFT 16
-#define NV01_RENDER_SOLID_LINE_LINE_POINT0_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_LINE_LINE_POINT1(x) (0x00000404+((x)*8))
-#define NV01_RENDER_SOLID_LINE_LINE_POINT1__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_LINE_POINT1_X_SHIFT 0
-#define NV01_RENDER_SOLID_LINE_LINE_POINT1_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_LINE_LINE_POINT1_Y_SHIFT 16
-#define NV01_RENDER_SOLID_LINE_LINE_POINT1_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_LINE_LINE32_POINT0_X(x) (0x00000480+((x)*16))
-#define NV01_RENDER_SOLID_LINE_LINE32_POINT0_X__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_LINE32_POINT0_Y(x) (0x00000484+((x)*16))
-#define NV01_RENDER_SOLID_LINE_LINE32_POINT0_Y__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_LINE32_POINT1_X(x) (0x00000488+((x)*16))
-#define NV01_RENDER_SOLID_LINE_LINE32_POINT1_X__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_LINE32_POINT1_Y(x) (0x0000048c+((x)*16))
-#define NV01_RENDER_SOLID_LINE_LINE32_POINT1_Y__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_POLYLINE(x) (0x00000500+((x)*4))
-#define NV01_RENDER_SOLID_LINE_POLYLINE__SIZE 0x00000020
-#define NV01_RENDER_SOLID_LINE_POLYLINE_X_SHIFT 0
-#define NV01_RENDER_SOLID_LINE_POLYLINE_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_LINE_POLYLINE_Y_SHIFT 16
-#define NV01_RENDER_SOLID_LINE_POLYLINE_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_LINE_POLYLINE32_POINT_X(x) (0x00000580+((x)*8))
-#define NV01_RENDER_SOLID_LINE_POLYLINE32_POINT_X__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_POLYLINE32_POINT_Y(x) (0x00000584+((x)*8))
-#define NV01_RENDER_SOLID_LINE_POLYLINE32_POINT_Y__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_CPOLYLINE_COLOR(x) (0x00000600+((x)*8))
-#define NV01_RENDER_SOLID_LINE_CPOLYLINE_COLOR__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_CPOLYLINE_POINT(x) (0x00000604+((x)*8))
-#define NV01_RENDER_SOLID_LINE_CPOLYLINE_POINT__SIZE 0x00000010
-#define NV01_RENDER_SOLID_LINE_CPOLYLINE_POINT_X_SHIFT 0
-#define NV01_RENDER_SOLID_LINE_CPOLYLINE_POINT_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_LINE_CPOLYLINE_POINT_Y_SHIFT 16
-#define NV01_RENDER_SOLID_LINE_CPOLYLINE_POINT_Y_MASK 0xffff0000
-
-
-#define NV04_RENDER_SOLID_LINE 0x0000005c
-
-#define NV04_RENDER_SOLID_LINE_BETA4 0x00000194
-#define NV04_RENDER_SOLID_LINE_SURFACE 0x00000198
-
-
-#define NV01_RENDER_SOLID_TRIANGLE 0x0000001d
-
-#define NV01_RENDER_SOLID_TRIANGLE_NOP 0x00000100
-#define NV01_RENDER_SOLID_TRIANGLE_NOTIFY 0x00000104
-#define NV01_RENDER_SOLID_TRIANGLE_PATCH 0x0000010c
-#define NV01_RENDER_SOLID_TRIANGLE_DMA_NOTIFY 0x00000180
-#define NV01_RENDER_SOLID_TRIANGLE_CLIP_RECTANGLE 0x00000184
-#define NV01_RENDER_SOLID_TRIANGLE_PATTERN 0x00000188
-#define NV01_RENDER_SOLID_TRIANGLE_ROP 0x0000018c
-#define NV01_RENDER_SOLID_TRIANGLE_BETA1 0x00000190
-#define NV01_RENDER_SOLID_TRIANGLE_SURFACE 0x00000194
-#define NV01_RENDER_SOLID_TRIANGLE_OPERATION 0x000002fc
-#define NV01_RENDER_SOLID_TRIANGLE_OPERATION_SRCCOPY_AND 0x00000000
-#define NV01_RENDER_SOLID_TRIANGLE_OPERATION_ROP_AND 0x00000001
-#define NV01_RENDER_SOLID_TRIANGLE_OPERATION_BLEND_AND 0x00000002
-#define NV01_RENDER_SOLID_TRIANGLE_OPERATION_SRCCOPY 0x00000003
-#define NV01_RENDER_SOLID_TRIANGLE_OPERATION_SRCCOPY_PREMULT 0x00000004
-#define NV01_RENDER_SOLID_TRIANGLE_OPERATION_BLEND_PREMULT 0x00000005
-#define NV01_RENDER_SOLID_TRIANGLE_COLOR_FORMAT 0x00000300
-#define NV01_RENDER_SOLID_TRIANGLE_COLOR 0x00000304
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT0 0x00000310
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT0_X_SHIFT 0
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT0_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT0_Y_SHIFT 16
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT0_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT1 0x00000314
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT1_X_SHIFT 0
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT1_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT1_Y_SHIFT 16
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT1_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT2 0x00000318
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT2_X_SHIFT 0
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT2_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT2_Y_SHIFT 16
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE_POINT2_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE32_POINT0_X 0x00000320
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE32_POINT0_Y 0x00000324
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE32_POINT1_X 0x00000328
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE32_POINT1_Y 0x0000032c
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE32_POINT2_X 0x00000330
-#define NV01_RENDER_SOLID_TRIANGLE_TRIANGLE32_POINT2_Y 0x00000334
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH(x) (0x00000400+((x)*4))
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH__SIZE 0x00000020
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH_X_SHIFT 0
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH_Y_SHIFT 16
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH32_POINT_X(x) (0x00000480+((x)*8))
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH32_POINT_X__SIZE 0x00000010
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH32_POINT_Y(x) (0x00000484+((x)*8))
-#define NV01_RENDER_SOLID_TRIANGLE_TRIMESH32_POINT_Y__SIZE 0x00000010
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_COLOR(x) (0x00000500+((x)*16))
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_COLOR__SIZE 0x00000008
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT0(x) (0x00000504+((x)*16))
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT0__SIZE 0x00000008
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT0_X_SHIFT 0
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT0_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT0_Y_SHIFT 16
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT0_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT1(x) (0x00000508+((x)*16))
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT1__SIZE 0x00000008
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT1_X_SHIFT 0
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT1_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT1_Y_SHIFT 16
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT1_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT2(x) (0x0000050c+((x)*16))
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT2__SIZE 0x00000008
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT2_X_SHIFT 0
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT2_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT2_Y_SHIFT 16
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIANGLE_POINT2_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIMESH_COLOR(x) (0x00000580+((x)*8))
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIMESH_COLOR__SIZE 0x00000010
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIMESH_POINT(x) (0x00000584+((x)*8))
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIMESH_POINT__SIZE 0x00000010
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIMESH_POINT_X_SHIFT 0
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIMESH_POINT_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIMESH_POINT_Y_SHIFT 16
-#define NV01_RENDER_SOLID_TRIANGLE_CTRIMESH_POINT_Y_MASK 0xffff0000
-
-
-#define NV04_RENDER_SOLID_TRIANGLE 0x0000005d
-
-#define NV04_RENDER_SOLID_TRIANGLE_BETA4 0x00000194
-#define NV04_RENDER_SOLID_TRIANGLE_SURFACE 0x00000198
-
-
-#define NV01_RENDER_SOLID_RECTANGLE 0x0000001e
-
-#define NV01_RENDER_SOLID_RECTANGLE_NOP 0x00000100
-#define NV01_RENDER_SOLID_RECTANGLE_NOTIFY 0x00000104
-#define NV01_RENDER_SOLID_RECTANGLE_PATCH 0x0000010c
-#define NV01_RENDER_SOLID_RECTANGLE_DMA_NOTIFY 0x00000180
-#define NV01_RENDER_SOLID_RECTANGLE_CLIP_RECTANGLE 0x00000184
-#define NV01_RENDER_SOLID_RECTANGLE_PATTERN 0x00000188
-#define NV01_RENDER_SOLID_RECTANGLE_ROP 0x0000018c
-#define NV01_RENDER_SOLID_RECTANGLE_BETA1 0x00000190
-#define NV01_RENDER_SOLID_RECTANGLE_SURFACE 0x00000194
-#define NV01_RENDER_SOLID_RECTANGLE_OPERATION 0x000002fc
-#define NV01_RENDER_SOLID_RECTANGLE_OPERATION_SRCCOPY_AND 0x00000000
-#define NV01_RENDER_SOLID_RECTANGLE_OPERATION_ROP_AND 0x00000001
-#define NV01_RENDER_SOLID_RECTANGLE_OPERATION_BLEND_AND 0x00000002
-#define NV01_RENDER_SOLID_RECTANGLE_OPERATION_SRCCOPY 0x00000003
-#define NV01_RENDER_SOLID_RECTANGLE_OPERATION_SRCCOPY_PREMULT 0x00000004
-#define NV01_RENDER_SOLID_RECTANGLE_OPERATION_BLEND_PREMULT 0x00000005
-#define NV01_RENDER_SOLID_RECTANGLE_COLOR_FORMAT 0x00000300
-#define NV01_RENDER_SOLID_RECTANGLE_COLOR 0x00000304
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_POINT(x) (0x00000400+((x)*8))
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_POINT__SIZE 0x00000010
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_POINT_X_SHIFT 0
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_POINT_X_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_POINT_Y_SHIFT 16
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_POINT_Y_MASK 0xffff0000
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_SIZE(x) (0x00000404+((x)*8))
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_SIZE__SIZE 0x00000010
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_SIZE_W_SHIFT 0
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_SIZE_W_MASK 0x0000ffff
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_SIZE_H_SHIFT 16
-#define NV01_RENDER_SOLID_RECTANGLE_RECTANGLE_SIZE_H_MASK 0xffff0000
-
-
-#define NV04_RENDER_SOLID_RECTANGLE 0x0000005e
Reply to: