Skip to content

Commit 2a2fffb

Browse files
author
Hans Verkuil
committed
media: remove the old videobuf framework
The last driver that still used this old framework has been converted to the videobuf2 framework. So it is now time to delete the old videobuf code. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
1 parent 785c4aa commit 2a2fffb

File tree

14 files changed

+0
-3460
lines changed

14 files changed

+0
-3460
lines changed

Documentation/driver-api/media/v4l2-core.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Video4Linux devices
1313
v4l2-subdev
1414
v4l2-event
1515
v4l2-controls
16-
v4l2-videobuf
1716
v4l2-videobuf2
1817
v4l2-dv-timings
1918
v4l2-flash-led-class

Documentation/driver-api/media/v4l2-dev.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,6 @@ changing the e.g. exposure of the webcam.
157157
Of course, you can always do all the locking yourself by leaving both lock
158158
pointers at ``NULL``.
159159

160-
If you use the old :ref:`videobuf framework <vb_framework>` then you must
161-
pass the :c:type:`video_device`->lock to the videobuf queue initialize
162-
function: if videobuf has to wait for a frame to arrive, then it will
163-
temporarily unlock the lock and relock it afterwards. If your driver also
164-
waits in the code, then you should do the same to allow other
165-
processes to access the device node while the first process is waiting for
166-
something.
167-
168160
In the case of :ref:`videobuf2 <vb2_framework>` you will need to implement the
169161
``wait_prepare()`` and ``wait_finish()`` callbacks to unlock/lock if applicable.
170162
If you use the ``queue->lock`` pointer, then you can use the helper functions

Documentation/driver-api/media/v4l2-videobuf.rst

Lines changed: 0 additions & 403 deletions
This file was deleted.

Documentation/translations/zh_CN/video4linux/v4l2-framework.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -768,18 +768,6 @@ const char *video_device_node_name(struct video_device *vdev);
768768
此功能,而非访问 video_device::num 和 video_device::minor 域。
769769

770770

771-
视频缓冲辅助函数
772-
---------------
773-
774-
v4l2 核心 API 提供了一个处理视频缓冲的标准方法(称为“videobuf”)。
775-
这些方法使驱动可以通过统一的方式实现 read()、mmap() 和 overlay()。
776-
目前在设备上支持视频缓冲的方法有分散/聚集 DMA(videobuf-dma-sg)、
777-
线性 DMA(videobuf-dma-contig)以及大多用于 USB 设备的用 vmalloc
778-
分配的缓冲(videobuf-vmalloc)。
779-
780-
请参阅 Documentation/driver-api/media/v4l2-videobuf.rst,以获得更多关于 videobuf
781-
层的使用信息。
782-
783771
v4l2_fh 结构体
784772
-------------
785773

drivers/media/v4l2-core/Kconfig

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,3 @@ config V4L2_CCI_I2C
8282
depends on I2C
8383
select REGMAP_I2C
8484
select V4L2_CCI
85-
86-
# Used by drivers that need Videobuf modules
87-
config VIDEOBUF_GEN
88-
tristate
89-
90-
config VIDEOBUF_DMA_SG
91-
tristate
92-
select VIDEOBUF_GEN
93-
94-
config VIDEOBUF_VMALLOC
95-
tristate
96-
select VIDEOBUF_GEN
97-
98-
config VIDEOBUF_DMA_CONTIG
99-
tristate
100-
select VIDEOBUF_GEN

drivers/media/v4l2-core/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,5 @@ obj-$(CONFIG_V4L2_JPEG_HELPER) += v4l2-jpeg.o
3333
obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o
3434
obj-$(CONFIG_V4L2_VP9) += v4l2-vp9.o
3535

36-
obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o
37-
obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
38-
obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
39-
obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
40-
4136
obj-$(CONFIG_VIDEO_TUNER) += tuner.o
4237
obj-$(CONFIG_VIDEO_DEV) += v4l2-dv-timings.o videodev.o

0 commit comments

Comments
 (0)