diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-09-11 09:48:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-09-11 09:49:23 +1000 |
| commit | 7f7a47952c0f981f9c9a6409c8cf8d025d55af64 (patch) | |
| tree | fe29791132b16d3bf4d4e0fc6e90df1dd314fdad /Documentation | |
| parent | 7bf23bfb0d7870d042460d31540bc03ceb2800c7 (diff) | |
| parent | fc7f148feb8975784bd40e41fff875d33f698be8 (diff) | |
Merge tag 'drm-misc-fixes-2020-09-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v5.9-rc5:
- Fix double free in virtio.
- Add missing put_device in sun4i, and other fixes.
- Small ingenic fixes.
- Handle sun4i alpha on lowest plane correctly.
- Remove output->enabled from virtio, as it should use crtc_state.
- Fix tve200 enable/disable.
- Documentation fix.
- Fix virtio unblank.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/478b49d1-b1b3-c983-7056-8a89249be435@mblankhorst.nl
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/driver-api/dma-buf.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/driver-api/dma-buf.rst b/Documentation/driver-api/dma-buf.rst index 100bfd227265..13ea0cc0a3fa 100644 --- a/Documentation/driver-api/dma-buf.rst +++ b/Documentation/driver-api/dma-buf.rst @@ -179,7 +179,7 @@ DMA Fence uABI/Sync File :internal: Indefinite DMA Fences -~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~ At various times &dma_fence with an indefinite time until dma_fence_wait() finishes have been proposed. Examples include: |