git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	4411e9e93da014312cc4fc2afc1308b4cd727630
tree	f09685517e9efa7d675dad8fd13694157ce50521	tree \| snapshot
parent	2db179c5d24957ef7cd01a7de162545d80e61206	commit \| diff
parent	046b4ee75eb141c762916a98bf50f051ad1c3a36	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>

Linux Kernel Source Tree.

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