aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/driver-api
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2022-04-26 16:44:31 +0300
committerJani Nikula <jani.nikula@intel.com>2022-04-26 16:44:31 +0300
commit3e8d34ed49ccfdbfad0dc46b9e1e4a278c10fd24 (patch)
treedebfb201936d9f81837f74ac6f3cb763ea428b72 /Documentation/driver-api
parentMerge tag 'gvt-next-2022-04-26' of https://github.com/intel/gvt-linux into drm-intel-next (diff)
parentMerge tag 'drm-misc-next-2022-04-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff)
downloadlinux-dev-3e8d34ed49ccfdbfad0dc46b9e1e4a278c10fd24.tar.xz
linux-dev-3e8d34ed49ccfdbfad0dc46b9e1e4a278c10fd24.zip
Merge drm/drm-next into drm-intel-next
Need to bring commit d8bb92e70a43 ("drm/dp: Factor out a function to probe a DPCD address") back as a dependency to further work in drm-intel-next. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'Documentation/driver-api')
-rw-r--r--Documentation/driver-api/dma-buf.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/driver-api/dma-buf.rst b/Documentation/driver-api/dma-buf.rst
index 55006678394a..36a76cbe9095 100644
--- a/Documentation/driver-api/dma-buf.rst
+++ b/Documentation/driver-api/dma-buf.rst
@@ -185,6 +185,12 @@ DMA Fence Chain
.. kernel-doc:: include/linux/dma-fence-chain.h
:internal:
+DMA Fence unwrap
+~~~~~~~~~~~~~~~~
+
+.. kernel-doc:: include/linux/dma-fence-unwrap.h
+ :internal:
+
DMA Fence uABI/Sync File
~~~~~~~~~~~~~~~~~~~~~~~~