| commit | e269f90f3d3f7c70cf661c660bf445597261f54a | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Jun 01 10:49:16 2012 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Jun 01 10:52:54 2012 +0200 |
| tree | f09685517e9efa7d675dad8fd13694157ce50521 | |
| parent | 112abd291db7d47974f166e742104d761bc76977 [diff] | |
| parent | 63bc620b45af8c743ac291c8725933278c712692 [diff] |
Merge remote-tracking branch 'airlied/drm-prime-vmap' into drm-intel-next-queued We need the latest dma-buf code from Dave Airlie so that we can pimp the backing storage handling code in drm/i915 with Chris Wilson's unbound tracking and stolen mem backed gem object code. Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>