mesa: Changes to 'master'
Eric Anholt
anholt at kemper.freedesktop.org
Sat Sep 22 00:20:45 UTC 2007
src/mesa/drivers/dri/Makefile.template | 3
src/mesa/drivers/dri/common/dri_bufmgr.c | 519 +----------
src/mesa/drivers/dri/common/dri_bufmgr.h | 217 +++-
src/mesa/drivers/dri/common/dri_bufmgr_fake.c | 882 ++++++++++++++++++++
src/mesa/drivers/dri/common/dri_bufmgr_ttm.c | 469 ++++++++++
src/mesa/drivers/dri/common/dri_bufpool.h | 86 -
src/mesa/drivers/dri/common/dri_drmpool.c | 228 -----
src/mesa/drivers/dri/i915tex/Makefile | 5
src/mesa/drivers/dri/i915tex/i830_context.h | 6
src/mesa/drivers/dri/i915tex/i830_metaops.c | 2
src/mesa/drivers/dri/i915tex/i830_texstate.c | 8
src/mesa/drivers/dri/i915tex/i830_vtbl.c | 5
src/mesa/drivers/dri/i915tex/i915_context.h | 6
src/mesa/drivers/dri/i915tex/i915_metaops.c | 2
src/mesa/drivers/dri/i915tex/i915_texstate.c | 8
src/mesa/drivers/dri/i915tex/i915_vtbl.c | 5
src/mesa/drivers/dri/i915tex/intel_batchbuffer.c | 226 ++---
src/mesa/drivers/dri/i915tex/intel_batchbuffer.h | 22
src/mesa/drivers/dri/i915tex/intel_batchpool.c | 418 ---------
src/mesa/drivers/dri/i915tex/intel_blit.c | 35
src/mesa/drivers/dri/i915tex/intel_blit.h | 6
src/mesa/drivers/dri/i915tex/intel_buffer_objects.c | 71 -
src/mesa/drivers/dri/i915tex/intel_buffer_objects.h | 8
src/mesa/drivers/dri/i915tex/intel_context.c | 46 -
src/mesa/drivers/dri/i915tex/intel_context.h | 23
src/mesa/drivers/dri/i915tex/intel_decode.c | 2
src/mesa/drivers/dri/i915tex/intel_ioctl.c | 19
src/mesa/drivers/dri/i915tex/intel_ioctl.h | 4
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c | 14
src/mesa/drivers/dri/i915tex/intel_pixel_read.c | 18
src/mesa/drivers/dri/i915tex/intel_regions.c | 106 +-
src/mesa/drivers/dri/i915tex/intel_regions.h | 10
src/mesa/drivers/dri/i915tex/intel_screen.c | 240 ++---
src/mesa/drivers/dri/i915tex/intel_screen.h | 23
src/mesa/drivers/dri/i915tex/intel_tex_image.c | 9
src/mesa/drivers/dri/i915tex/server/i830_common.h | 10
src/mesa/drivers/dri/i965/intel_context.c | 6
37 files changed, 2075 insertions(+), 1692 deletions(-)
commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary
New commits:
commit 39c709c0f6a9b2c910265390b31ce233a991ab68
Merge: 6016de6... d0350da...
Author: Eric Anholt <eric at anholt.net>
Date: Fri Sep 21 17:05:34 2007 -0700
Merge branch 'i915-unification'
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.
commit d0350dadaa52064f67e4e9001145af14478b2849
Author: Eric Anholt <eric at anholt.net>
Date: Fri Sep 21 16:16:54 2007 -0700
Fix buffer/fence reference counting due to Destroy vs Unreference difference.
While here, remove the unnecessary fence type saving for the wait ioctl, as
a 0 argument for type means "use your other saved copy".
commit c1ecc383204914567c6de1587d7b9559ec72ce6e
Author: Eric Anholt <eric at anholt.net>
Date: Thu Sep 20 11:41:25 2007 -0700
Uniquely validate the batchbuffer-referenced buffers.
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.
commit 75912596741d1afe5827dab6913c3d810eda8788
Author: Eric Anholt <eric at anholt.net>
Date: Thu Sep 20 11:38:32 2007 -0700
Add disabled-by-default tracing of TTM bufmgr operations.
commit b7fd06a871893d8ed482d16207136e324bb7d85c
Author: Eric Anholt <eric at anholt.net>
Date: Thu Sep 20 09:20:48 2007 -0700
Fix flipped sign to strerror.
commit 4f1c9f7e510122b32c82ee9adbdb4987dae27afe
Merge: e3745da... 45899a4...
Author: Eric Anholt <eric at anholt.net>
Date: Wed Sep 19 11:05:36 2007 -0700
Merge branch 'master' into i915-unification
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
commit e3745dac59602a9d21b49d602646de5aef95075f
Author: Eric Anholt <eric at anholt.net>
Date: Tue Sep 18 15:46:16 2007 -0700
Add some error reporting and a couple of assertions to TTM bufmgr.
commit 3e168a0ec840af65863e197f4a884aae905b213e
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 16 14:32:53 2007 -0700
Convert TTM code to require the server provide buffers for front/back/depth.
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.
commit b6ad5e7de8dc84ee42eeeb62d2112f096413b335
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 16 14:36:35 2007 -0700
Move i915_disasm to later so we can use the hardware offset.
commit 64297acf9e96353fe724362248246acaf0be8cb8
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 16 14:35:06 2007 -0700
Fix bad printf on TTM fence_wait failure.
commit 2b77a8696b14bc36be359bf858189ade5fab8511
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 16 14:34:24 2007 -0700
Don't forget to update buffer offset after validation.
commit 327e6551197e6069150200878b4e6e7a595e2bee
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 16 14:28:12 2007 -0700
Add decode for XY_COLOR_BLT and XY_SRC_COPY_BLT.
commit 101563a838a9ed1f9cad5f99fcbf598cbdfba0df
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 2 15:55:42 2007 -0700
Don't try to use kernel BO flags in dri_bufmgr_fake internals.
commit 9c61925da0f24dfc5f4cb1ee5d50e18bfe3f39ce
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jul 31 09:22:43 2007 -0700
bufmgr_fake: eliminate the referenced list, which is now just on_hardware.
commit 5e2acfee78c9e72d67d822974e9986fe99920ccf
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jul 31 09:21:20 2007 -0700
Don't initialize extensions we can't support when !ttm.
commit 05fe75e61902d0dba93ce8910f2804c196d81ab3
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jul 5 16:57:53 2007 -0700
Add missing -g in FreeBSD OPT_CFLAGS
commit 9a4cc2e90595a41d3d3cb6a752e4b5a089a213d2
Author: Eric Anholt <eric at anholt.net>
Date: Wed Jul 25 10:12:23 2007 -0700
Add notes about bufmgr initialization failures.
commit d086f7ab2e38fc2b5398aed6823453ae53e5dcb8
Author: Eric Anholt <eric at anholt.net>
Date: Fri Jul 6 12:01:33 2007 -0700
bufmgr_ttm: hook up destroy function, track buffer names.
commit f7643b96e9e526a7610dec51650546e4b916ccd2
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jul 5 15:45:49 2007 -0700
bufmgr_fake: Keep the bufmgr lock held while freeing a block.
commit 23e0ca2ebb0d123c7a40bb8b3687adb407c95504
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jul 5 13:56:38 2007 -0700
Fix copy'n'pasteo that broke display lists.
commit 3cf20ddbfc9d3a1dad4c058050595c54589257d3
Merge: 2ac17c6... 4fe48b4...
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jul 5 11:36:44 2007 -0700
Merge branch 'i915-unification' of git+ssh://people.freedesktop.org/~anholt/mesa into i915-unification
commit 4fe48b4e8568896cdbc822323aeec0a41c72ff2a
Merge: 5d9dc02... ed5ed6f...
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jun 21 14:14:24 2007 -0700
Merge branch 'origin' into i915-unification
commit 5d9dc02cbecd94f822f853fd01878784596f4eba
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jun 21 12:57:15 2007 -0700
Reset saved state for disasm when we've lost the context.
commit f3f29d632e8a51914b87e087d6ab4d1d6f47b7d7
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jun 21 12:53:07 2007 -0700
Add decoding of inline primitives in debug output.
commit f972f58d8003de9495af82e7927fb962f460b083
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jun 21 11:44:48 2007 -0700
Improve fake bufmgr debugging, and don't try to migrate static buffers.
commit 1a49cd7f5b22eb326b25bddf24a02f68b8150a8d
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jun 21 09:49:24 2007 -0700
Add missing i915_disasm.h header and adjust copyright formatting on the .c
commit bf0ae055de73e0cf66085e02ad4881bea497e4cb
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jun 18 12:20:07 2007 -0700
Fix TTM static allocation flags.
commit 1ddbfd779b2e11131d3c86406497fe970d8f816b
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jun 18 12:19:42 2007 -0700
Test for TTM presence initially rather than test for lack of classic aperture.
commit 2754ac0878cbcfa13a4c16b8858500d812d9bb8a
Author: Eric Anholt <eric at anholt.net>
Date: Fri Jun 15 16:58:15 2007 -0700
Replace intel_dump_batchbuffer with a more informational version.
commit 7a452b21a2fa329871062a6ee49f0d0f4928d01c
Author: Eric Anholt <eric at anholt.net>
Date: Fri Jun 15 16:20:34 2007 -0700
Correct a mis-count in a LOAD_STATE_IMMEDIATE_1 length argument.
commit 2ac17c68e2d64260168a54a275e839775828f534
Author: Eric Anholt <eric at anholt.net>
Date: Thu May 31 09:45:45 2007 -0700
Add buffer manager destroy function.
commit fb7e21514f96c36e4c5abcb6621d48cb16a8c1e1
Author: Eric Anholt <eric at anholt.net>
Date: Thu May 31 09:34:08 2007 -0700
Remove some stale comments.
commit b9323aa2cb4563fba1b328dbc802d673449056ac
Author: Eric Anholt <eric at anholt.net>
Date: Thu May 24 16:55:06 2007 -0700
Replace the flags/hint arguments to bo_alloc{,_static} with a location mask.
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.
commit fd9d27e0686f5a15803d13d207e58be1972fdf31
Merge: b1fcabe... f116aed...
Author: Eric Anholt <eric at anholt.net>
Date: Thu May 24 13:59:50 2007 -0700
Merge branch 'master' into i915-unification
Conflicts:
src/mesa/drivers/dri/i915tex/i830_texstate.c
src/mesa/drivers/dri/i915tex/i915_texstate.c
commit b1fcabefa2f3fa81a20c1556383458315bb49bbf
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 21 13:06:12 2007 -0700
Don't read beyond the end of the buffer with INTEL_DEBUG=bat.
commit b0b84529cf1d61d3a53d402f039b442260788624
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 21 11:08:55 2007 -0700
Enable INTEL_DEBUG environment variable.
commit 2b325a9f32e4478d324feaa9fcc3706b8bae4a3b
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 21 10:53:33 2007 -0700
Remove unused intel_batchpool.c.
This may need to be implemented again, but probably not as a buffer manager
(pool).
commit 8b8d4d3e106b1ca7174c834a2f9b494922fc6e72
Author: Eric Anholt <eric at anholt.net>
Date: Mon May 21 10:49:32 2007 -0700
Notify the fake buffer manager on contended lock take.
commit 1bdee1853627e08894bd267b8f0ec176a1b5978f
Merge: c085e35... 4fca6bf...
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 14:14:12 2007 -0700
Merge branch 'master' into i915-unification
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
commit c085e350df593ab2af60f53b86265db4c3eab38a
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 13:47:46 2007 -0700
Fix a refcounting mistake with first_swap_fence.
commit a926b7397bb19dea74995bcb02c0ee5438e4a63c
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 13:47:21 2007 -0700
Fix another mis-calling of _fence_wait_internal.
commit 431baf221ea7858ecb5edb2a5a01b5f993147a4d
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 12:59:39 2007 -0700
Allow unreference with a NULL argument.
commit 425d0c6305f7781788077452ae9e2de595b0961d
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 12:57:34 2007 -0700
Fix double-counting of low_offset in block->virtual.
commit b0529dcc7bf6aa8330da19d98daa0abaa932cc97
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 12:39:00 2007 -0700
Zero out bufmgr_fake on alloc.
commit 71648a088ee7bfb1a535f32c8afdef4dc2d43e9e
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 12:10:05 2007 -0700
Dead code elimination and fix bufmgr_fake_wait_idle.
commit 180f0bb964cd7aa233233dbe3bc6605e07ef1d4c
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 12:09:34 2007 -0700
Kill old struct bufmgr members.
commit bb1bb88bab809ce47fc5669ceb294b83ed164975
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 11:55:00 2007 -0700
Fix some use-before-initialize in bufmgr_fake.
commit 4cf2cc0d18df67d1d550b777c8db2e088f1c4188
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 18 11:29:55 2007 -0700
Ratchet required version down to 1.5 (pre-TTM).
commit b12b24a430e2d328cbe102612b8a152e5c925cbf
Author: Eric Anholt <eric at anholt.net>
Date: Thu May 17 15:36:43 2007 -0700
Restore missing intel_batchbuffer_reset() which was needed.
commit 1f08f5d97068ea89f0fa527520a2ccb0a69ea50b
Author: Eric Anholt <eric at anholt.net>
Date: Thu May 17 15:36:26 2007 -0700
Rename the i915tex_dri.so driver to just i915_dri.so again.
commit cfc21190af1038f204d38ab4764a9c731b0323a5
Author: Eric Anholt <eric at anholt.net>
Date: Thu May 17 15:28:01 2007 -0700
Convert i915tex to the new interface and make it compile.
commit 7b971a50088caeeb2d66d99dbf6bef580a01c5d9
Author: Eric Anholt <eric at anholt.net>
Date: Wed May 16 15:14:20 2007 -0700
WIP: Replace TTM buffer pool manager with a simplified interface.
The interface is not solid yet (some simplification to do still, and
adjustment for 0-copy), and the drivers are not converted. However, the new
interface allows using the same calls to support either a TTM or a classic
static allocation backend, with the static backend allowing a more limited
feature set.
More information about the mesa-commit
mailing list