diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2020-09-24 09:05:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2020-09-24 09:05:04 -0700 |
| commit | 8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0 (patch) | |
| tree | 3121d352dc24b844193b4a5786c80684c0cf2bfd /Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst | |
| parent | Merge tag 'sound-5.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| parent | media: dt-bindings: media: imx274: Convert to json-schema (diff) | |
| download | linux-8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0.tar.gz linux-8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0.tar.bz2 linux-8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0.zip | |
Merge tag 'media/v5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- fix a regression at the CEC adapter core
- two uAPI patches (one revert) for changes in this development cycle
* tag 'media/v5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: dt-bindings: media: imx274: Convert to json-schema
media: media/v4l2: remove V4L2_FLAG_MEMORY_NON_CONSISTENT flag
media: cec-adap.c: don't use flush_scheduled_work()
Diffstat (limited to 'Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst')
| -rw-r--r-- | Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst b/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst index 75d894d9c36c..0e3e2fde65e8 100644 --- a/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst +++ b/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst @@ -112,17 +112,10 @@ aborting or finishing any DMA in progress, an implicit ``V4L2_MEMORY_MMAP`` and ``type`` set to the buffer type. This will free any previously allocated buffers, so this is typically something that will be done at the start of the application. - * - union { - - (anonymous) - * - __u32 - - ``flags`` - - Specifies additional buffer management attributes. - See :ref:`memory-flags`. * - __u32 - ``reserved``\ [1] - - Kept for backwards compatibility. Use ``flags`` instead. - * - } - - + - A place holder for future extensions. Drivers and applications + must set the array to zero. .. tabularcolumns:: |p{6.1cm}|p{2.2cm}|p{8.7cm}| @@ -169,7 +162,6 @@ aborting or finishing any DMA in progress, an implicit - This capability is set by the driver to indicate that the queue supports cache and memory management hints. However, it's only valid when the queue is used for :ref:`memory mapping <mmap>` streaming I/O. See - :ref:`V4L2_FLAG_MEMORY_NON_CONSISTENT <V4L2-FLAG-MEMORY-NON-CONSISTENT>`, :ref:`V4L2_BUF_FLAG_NO_CACHE_INVALIDATE <V4L2-BUF-FLAG-NO-CACHE-INVALIDATE>` and :ref:`V4L2_BUF_FLAG_NO_CACHE_CLEAN <V4L2-BUF-FLAG-NO-CACHE-CLEAN>`. |