diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 08:48:42 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 08:48:42 +0400 |
| commit | 2145199c4f0db7c517dd788abec301dc84b91bd0 (patch) | |
| tree | d5ae3afd434b81a377bf3ddb3780703952a4fdc0 /Documentation | |
| parent | 21ebd6c68b5511b55f4f456e4ba17c2d711e3617 (diff) | |
| parent | 081794564e3000e602de290d1121792c33b475a4 (diff) | |
| download | linux-2145199c4f0db7c517dd788abec301dc84b91bd0.tar.xz | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
dma-buf: Documentation update for Kconfig select
nouveau: Support Optimus models for vga_switcheroo
nouveau: properly check for _DSM function support
dma-buf: drop option text so users don't select it.
radeon: Call pci_clear_master() instead of open-coding it.
gma500: Discard modes that don't fit in stolen memory
drm: bump DRM_CONNECTOR_MAX_ENCODER from 2 to 3
drm/radeon/kms: Fix module parameter description format
drm/radeon/kms/ni: fix packet2 handling for VM IB parser
ttm/dma: Remove the WARN() which is not useful.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/dma-buf-sharing.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/dma-buf-sharing.txt b/Documentation/dma-buf-sharing.txt index 510eab32f392..225f96d88f55 100644 --- a/Documentation/dma-buf-sharing.txt +++ b/Documentation/dma-buf-sharing.txt @@ -219,6 +219,10 @@ NOTES: If the exporter chooses not to allow an attach() operation once a map_dma_buf() API has been called, it simply returns an error. +Miscellaneous notes: +- Any exporters or users of the dma-buf buffer sharing framework must have + a 'select DMA_SHARED_BUFFER' in their respective Kconfigs. + References: [1] struct dma_buf_ops in include/linux/dma-buf.h [2] All interfaces mentioned above defined in include/linux/dma-buf.h |