author | Daniel Vetter <daniel.vetter@ffwll.ch> | |
Fri, 1 Jun 2012 08:49:16 +0000 (10:49 +0200) | ||
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | |
Fri, 1 Jun 2012 08:52:54 +0000 (10:52 +0200) | ||
commit | e269f90f3d3f7c70cf661c660bf445597261f54a | |
tree | f09685517e9efa7d675dad8fd13694157ce50521 | tree | snapshot (tar.xz tar.gz zip) |
parent | 112abd291db7d47974f166e742104d761bc76977 | commit | diff |
parent | 63bc620b45af8c743ac291c8725933278c712692 | commit | 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>
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>