From: Eric Anholt Date: Sat, 22 Sep 2007 00:05:34 +0000 (-0700) Subject: Merge branch 'i915-unification' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39c709c0f6a9b2c910265390b31ce233a991ab68;p=mesa.git 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. --- 39c709c0f6a9b2c910265390b31ce233a991ab68