Merge commit 'airlied/i915-ttm-cfu'
authorEric Anholt <eric@anholt.net>
Thu, 24 Jan 2008 20:26:29 +0000 (12:26 -0800)
committerEric Anholt <eric@anholt.net>
Thu, 24 Jan 2008 20:28:42 +0000 (12:28 -0800)
commit8931585d2c478993b23d46bf5f83c99f8bb5fbad
tree4c6ae560cbb95fd87b3f00fc00ef2c0fcf6c7697
parentb87c1ab2c06d0556d57a6377cf7ade737eef5b73
parenta018abd446dc454b6950de8701dc44c5170e5933
Merge commit 'airlied/i915-ttm-cfu'

This requires current DRM which changes the relocation buffer from being a
buffer object to plain malloced memory.