projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d20d317 71d7282)
Merge branch 'drm/next' of git://linuxtv.org/pinchartl/fbdev into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 10 Jun 2013 22:14:21 +0000 (08:14 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 10 Jun 2013 22:14:21 +0000 (08:14 +1000)
commitedee06b6f6b55c81c4cb78d0776d8ca01b05380d
treeb2ed77452d8375d53a57012c0ff16affb7aef717tree | snapshot (tar.gz zip)
parentd20d3174806ef6589cb912a488657d21fcd7ece2commit | diff
parent71d7282a0f1abb488e5be4d154893579624bc683commit | diff
Merge branch 'drm/next' of git://linuxtv.org/pinchartl/fbdev into drm-next

GEM CMA PRIME support from Laurent.

* 'drm/next' of git://linuxtv.org/pinchartl/fbdev:
  drm: GEM CMA: Add DRM PRIME support
  drm: GEM CMA: Split object mapping into GEM mapping and CMA mapping
  drm: GEM CMA: Split object creation into object alloc and DMA memory alloc
  drm/omap: Use drm_gem_mmap_obj() to implement dma-buf mmap
  drm/gem: Split drm_gem_mmap() into object search and object mapping
include/drm/drmP.h diff1 | diff2 | blob | history