Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'i915-unification' | Eric Anholt | 2007-09-21 | 37 | -1686/+2069 |
|\ | | | | | | | | | | | | | | | | | This branch replaces the DRM pool interface used by i915tex with a "dri_bufmgr" interface in dri/common which may be set up to use either TTM or traditional static memory management according to what is available. The i915tex TTM code now requires an updated DDX which provides proper buffer objects for the static front/back/depth, instead of using fake buffers. The driver is now built as i915_dri.so, and should replace the old i915 driver shortly. | ||||
| * | Fix buffer/fence reference counting due to Destroy vs Unreference difference. | Eric Anholt | 2007-09-21 | 1 | -7/+39 |
| | | | | | | | | | | While here, remove the unnecessary fence type saving for the wait ioctl, as a 0 argument for type means "use your other saved copy". | ||||
| * | Uniquely validate the batchbuffer-referenced buffers. | Eric Anholt | 2007-09-20 | 1 | -1/+46 |
| | | | | | | | | | | | | Otherwise, for multiple references by the batchbuffer, the kernel would see the buffer already on the unfenced list and wait for it to leave the list before continuing, leading to hanging and eventual -EBUSY. | ||||
| * | Add disabled-by-default tracing of TTM bufmgr operations. | Eric Anholt | 2007-09-20 | 1 | -0/+34 |
| | | |||||
| * | Fix flipped sign to strerror. | Eric Anholt | 2007-09-20 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' into i915-unification | Eric Anholt | 2007-09-20 | 365 | -7897/+15997 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_drmpool.c src/mesa/drivers/dri/i915tex/i915_vtbl.c src/mesa/drivers/dri/i915tex/intel_batchbuffer.c src/mesa/drivers/dri/i915tex/intel_context.c | ||||
| * | | Add some error reporting and a couple of assertions to TTM bufmgr. | Eric Anholt | 2007-09-18 | 1 | -0/+8 |
| | | | |||||
| * | | Convert TTM code to require the server provide buffers for front/back/depth. | Eric Anholt | 2007-08-16 | 7 | -81/+121 |
| | | | | | | | | | | | | | | | | | | This removes the use of fake buffers from the driver, such that it could probably be removed from the interface. It also should assist in proper synchronization of access. | ||||
| * | | Move i915_disasm to later so we can use the hardware offset. | Eric Anholt | 2007-08-16 | 1 | -3/+7 |
| | | | |||||
| * | | Fix bad printf on TTM fence_wait failure. | Eric Anholt | 2007-08-16 | 1 | -1/+1 |
| | | | |||||
| * | | Don't forget to update buffer offset after validation. | Eric Anholt | 2007-08-16 | 1 | -0/+2 |
| | | | |||||
| * | | Add decode for XY_COLOR_BLT and XY_SRC_COPY_BLT. | Eric Anholt | 2007-08-16 | 1 | -2/+85 |
| | | | |||||
| * | | Don't try to use kernel BO flags in dri_bufmgr_fake internals. | Eric Anholt | 2007-08-02 | 1 | -9/+10 |
| | | | |||||
| * | | bufmgr_fake: eliminate the referenced list, which is now just on_hardware. | Eric Anholt | 2007-07-31 | 1 | -41/+8 |
| | | | |||||
| * | | Don't initialize extensions we can't support when !ttm. | Eric Anholt | 2007-07-31 | 1 | -2/+9 |
| | | | |||||
| * | | Add missing -g in FreeBSD OPT_CFLAGS | Eric Anholt | 2007-07-31 | 1 | -1/+1 |
| | | | |||||
| * | | Add notes about bufmgr initialization failures. | Eric Anholt | 2007-07-25 | 2 | -0/+3 |
| | | | |||||
| * | | bufmgr_ttm: hook up destroy function, track buffer names. | Eric Anholt | 2007-07-06 | 1 | -1/+5 |
| | | | |||||
| * | | bufmgr_fake: Keep the bufmgr lock held while freeing a block. | Eric Anholt | 2007-07-05 | 1 | -1/+1 |
| | | | |||||
| * | | Fix copy'n'pasteo that broke display lists. | Eric Anholt | 2007-07-05 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'i915-unification' of ↵ | Eric Anholt | 2007-07-05 | 70 | -837/+1958 |
| |\ \ | | | | | | | | | | | | | git+ssh://people.freedesktop.org/~anholt/mesa into i915-unification | ||||
| | * \ | Merge branch 'origin' into i915-unification | Eric Anholt | 2007-06-21 | 63 | -798/+1125 |
| | |\ \ | |||||
| | * | | | Reset saved state for disasm when we've lost the context. | Eric Anholt | 2007-06-21 | 3 | -0/+11 |
| | | | | | |||||
| | * | | | Add decoding of inline primitives in debug output. | Eric Anholt | 2007-06-21 | 1 | -11/+127 |
| | | | | | |||||
| | * | | | Improve fake bufmgr debugging, and don't try to migrate static buffers. | Eric Anholt | 2007-06-21 | 1 | -5/+34 |
| | | | | | |||||
| | * | | | Add missing i915_disasm.h header and adjust copyright formatting on the .c | Eric Anholt | 2007-06-21 | 2 | -3/+31 |
| | | | | | |||||
| | * | | | Fix TTM static allocation flags. | Eric Anholt | 2007-06-18 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Test for TTM presence initially rather than test for lack of classic aperture. | Eric Anholt | 2007-06-18 | 2 | -10/+23 |
| | | | | | |||||
| | * | | | Replace intel_dump_batchbuffer with a more informational version. | Eric Anholt | 2007-06-15 | 3 | -22/+619 |
| | | | | | |||||
| | * | | | Correct a mis-count in a LOAD_STATE_IMMEDIATE_1 length argument. | Eric Anholt | 2007-06-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add buffer manager destroy function. | Eric Anholt | 2007-05-31 | 5 | -3/+30 |
| | | | | | |||||
| * | | | | Remove some stale comments. | Eric Anholt | 2007-05-31 | 1 | -2/+0 |
| |/ / / | |||||
| * | | | Replace the flags/hint arguments to bo_alloc{,_static} with a location mask. | Eric Anholt | 2007-05-24 | 7 | -44/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, allocations only take locations, rather than a variety of unused flags. The only interesting flag before was the no_move/no_evict pair for scanout and similar buffers, which the DRI drivers don't use. That will be readded when we get to using this code for display buffer allocation, by adding a pin/unpin call (dynamic pinning/unpinning may be useful for VT switching and root window resizing). This commit changes one instance of DRM_BO_FLAG_MEM_LOCAL with DRM_BO_FLAG_MEM_TT, which appeared to have been unintentional. | ||||
| * | | | Merge branch 'master' into i915-unification | Eric Anholt | 2007-05-24 | 104 | -2885/+2851 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i915tex/i830_texstate.c src/mesa/drivers/dri/i915tex/i915_texstate.c | ||||
| * | | | | Don't read beyond the end of the buffer with INTEL_DEBUG=bat. | Eric Anholt | 2007-05-21 | 1 | -5/+15 |
| | | | | | |||||
| * | | | | Enable INTEL_DEBUG environment variable. | Eric Anholt | 2007-05-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove unused intel_batchpool.c. | Eric Anholt | 2007-05-21 | 1 | -418/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This may need to be implemented again, but probably not as a buffer manager (pool). | ||||
| * | | | | Notify the fake buffer manager on contended lock take. | Eric Anholt | 2007-05-21 | 2 | -0/+11 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i915-unification | Eric Anholt | 2007-05-18 | 281 | -18038/+21720 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_drmpool.c src/mesa/drivers/dri/i915tex/intel_batchpool.c src/mesa/drivers/dri/i915tex/intel_buffer_objects.c src/mesa/drivers/dri/i915tex/intel_regions.c src/mesa/drivers/dri/i915tex/intel_screen.c src/mesa/drivers/dri/i915tex/intel_screen.h | ||||
| * | | | | | Fix a refcounting mistake with first_swap_fence. | Eric Anholt | 2007-05-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix another mis-calling of _fence_wait_internal. | Eric Anholt | 2007-05-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Allow unreference with a NULL argument. | Eric Anholt | 2007-05-18 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | Fix double-counting of low_offset in block->virtual. | Eric Anholt | 2007-05-18 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Zero out bufmgr_fake on alloc. | Eric Anholt | 2007-05-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Dead code elimination and fix bufmgr_fake_wait_idle. | Eric Anholt | 2007-05-18 | 1 | -4/+1 |
| | | | | | | |||||
| * | | | | | Kill old struct bufmgr members. | Eric Anholt | 2007-05-18 | 2 | -6/+0 |
| | | | | | | |||||
| * | | | | | Fix some use-before-initialize in bufmgr_fake. | Eric Anholt | 2007-05-18 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Ratchet required version down to 1.5 (pre-TTM). | Eric Anholt | 2007-05-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Restore missing intel_batchbuffer_reset() which was needed. | Eric Anholt | 2007-05-17 | 1 | -4/+16 |
| | | | | | | |||||
| * | | | | | Rename the i915tex_dri.so driver to just i915_dri.so again. | Eric Anholt | 2007-05-17 | 1 | -1/+1 |
| | | | | | |