projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6016de6 d0350da)
Merge branch 'i915-unification'
authorEric Anholt <eric@anholt.net>
Sat, 22 Sep 2007 00:05:34 +0000 (17:05 -0700)
committerEric Anholt <eric@anholt.net>
Sat, 22 Sep 2007 00:13:20 +0000 (17:13 -0700)
commit39c709c0f6a9b2c910265390b31ce233a991ab68
treea4484723b11f36f822e3bfeeeaa3652da2753859tree
parent6016de689fb9f29fe148b5ff0daf0b34a8510e23commit | diff
parentd0350dadaa52064f67e4e9001145af14478b2849commit | diff
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.