review.tizen.org Git - platform/upstream/libdrm.git/commit

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a1d9600 62a3be9)

author	Jesse Barnes <jbarnes@jbarnes-t61.(none)>
	Wed, 11 Jun 2008 17:25:45 +0000 (10:25 -0700)
committer	Jesse Barnes <jbarnes@virtuousgeek.org>
	Wed, 11 Jun 2008 17:25:45 +0000 (10:25 -0700)
commit	f5412a944fa4666e25f4fa27b6ed85c21ccb65a0
tree	968afc250072af4525757c71bc9f3e18618bcc01	tree \| snapshot
parent	a1d96007241a78dd2b4a718df8e0568fe7994c22	commit \| diff
parent	62a3be962f1915d17813ecbfc9544232908b44e4	commit \| diff

Merge commit 'origin/drm-gem' into modesetting-gem

Use new GEM based ring buffer initialization. Still need to init GEM & use it
for framebuffer allocation etc.

Conflicts:

shared-core/i915_dma.c
shared-core/i915_drv.h

linux-core/drmP.h	diff1 \|	diff2 \|	blob \| history
linux-core/i915_gem.c	diff1 \|	diff2 \|	blob \| history
shared-core/i915_dma.c	diff1 \|	diff2 \|	blob \| history
shared-core/i915_drm.h	diff1 \|	diff2 \|	blob \| history
shared-core/i915_drv.h	diff1 \|	diff2 \|	blob \| history
shared-core/i915_init.c	diff1 \|	\|	blob \| history
shared-core/i915_irq.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;