projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
112abd2
63bc620
)
Merge remote-tracking branch 'airlied/drm-prime-vmap' into drm-intel-next-queued
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)
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>
1
2
drivers/gpu/drm/i915/i915_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_irq.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_display.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_dp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_sdvo.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/i915/i915_drv.h
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_irq.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_display.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_dp.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_sdvo.c
Simple merge