git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

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
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>

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history