summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMaxime Ripard <maxime@cerno.tech>2022-04-05 11:38:33 +0200
committerMaxime Ripard <maxime@cerno.tech>2022-04-05 11:39:22 +0200
commit13043d1a12c54d8b6605bbead5e177e9fb98a287 (patch)
tree8dc499b9c583ae7d1efbfc050b639aaa686eafcd /Documentation
parentcf5c5763eb531ff5120111ad300126e926fb5a56 (diff)
parent67bae5f28c895f8737a1974c3f31cf12b9170b14 (diff)
Merge drm-misc/drm-misc-next-fixes into drm-misc-fixes
There were a few patches left in drm-misc-next-fixes, let's bring them into drm-misc-fixes. Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'Documentation')
-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
~~~~~~~~~~~~~~~~~~~~~~~~