diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 18:01:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 18:01:18 -0700 |
| commit | 9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702 (patch) | |
| tree | 4a6e11e3379ee93c1992cfd595872dded1fd2fac /fs/ecryptfs | |
| parent | 76f901eb4659779ecacd0e4eba49f55442daef53 (diff) | |
| parent | 63bc620b45af8c743ac291c8725933278c712692 (diff) | |
| download | blackbird-op-linux-9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702.tar.gz blackbird-op-linux-9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702.zip | |
Merge branch 'drm-prime-vmap' of git://people.freedesktop.org/~airlied/linux
Pull drm prime mmap/vmap code from Dave Airlie:
"As mentioned previously these are the extra bits of drm that relied on
the dma-buf pull to work, the first three just stub out the mmap
interface, and the next set provide vmap export to i915/radeon/nouveau
and vmap import to udl."
* 'drm-prime-vmap' of git://people.freedesktop.org/~airlied/linux:
radeon: add radeon prime vmap support.
nouveau: add vmap support to nouveau prime support
udl: support vmapping imported dma-bufs
i915: add dma-buf vmap support for exporting vmapped buffer
radeon: add stub dma-buf mmap functionality
nouveau: add stub dma-buf mmap functionality.
i915: add stub dma-buf mmap callback.
Diffstat (limited to 'fs/ecryptfs')
0 files changed, 0 insertions, 0 deletions
