diff options
author | Dave Airlie <airlied@redhat.com> | 2013-06-11 02:14:21 +0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-06-11 02:14:21 +0400 |
commit | edee06b6f6b55c81c4cb78d0776d8ca01b05380d (patch) | |
tree | b2ed77452d8375d53a57012c0ff16affb7aef717 /drivers/gpu/drm/drm_edid_load.c | |
parent | d20d3174806ef6589cb912a488657d21fcd7ece2 (diff) | |
parent | 71d7282a0f1abb488e5be4d154893579624bc683 (diff) | |
download | linux-edee06b6f6b55c81c4cb78d0776d8ca01b05380d.tar.xz |
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
Diffstat (limited to 'drivers/gpu/drm/drm_edid_load.c')
0 files changed, 0 insertions, 0 deletions