media: drop CONFIG_MEDIA_CONTROLLER_REQUEST_API
This config option was added during the development of the Request API to make it easy to disable it. The Request API is now stable so it is time to drop this option altogether. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
ed5000fe5a
commit
26cb92f7f7
@ -684,10 +684,8 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps)
|
||||
*caps |= V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF;
|
||||
if (q->allow_cache_hints && q->io_modes & VB2_MMAP)
|
||||
*caps |= V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS;
|
||||
#ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
|
||||
if (q->supports_requests)
|
||||
*caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
|
||||
#endif
|
||||
}
|
||||
|
||||
static void validate_memory_flags(struct vb2_queue *q,
|
||||
|
@ -11,10 +11,3 @@ config MEDIA_CONTROLLER_DVB
|
||||
Enable the media controller API support for DVB.
|
||||
|
||||
This is currently experimental.
|
||||
|
||||
config MEDIA_CONTROLLER_REQUEST_API
|
||||
bool
|
||||
depends on MEDIA_CONTROLLER
|
||||
help
|
||||
This option enables the Request API for the Media controller and V4L2
|
||||
interfaces. It is currently needed by a few stateless codec drivers.
|
||||
|
@ -372,16 +372,12 @@ static long media_device_get_topology(struct media_device *mdev, void *arg)
|
||||
|
||||
static long media_device_request_alloc(struct media_device *mdev, void *arg)
|
||||
{
|
||||
#ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
|
||||
int *alloc_fd = arg;
|
||||
|
||||
if (!mdev->ops || !mdev->ops->req_validate || !mdev->ops->req_queue)
|
||||
return -ENOTTY;
|
||||
|
||||
return media_request_alloc(mdev, alloc_fd);
|
||||
#else
|
||||
return -ENOTTY;
|
||||
#endif
|
||||
}
|
||||
|
||||
static long copy_arg_from_user(void *karg, void __user *uarg, unsigned int cmd)
|
||||
|
@ -24,7 +24,6 @@ config VIDEO_MEDIATEK_VCODEC
|
||||
select V4L2_H264
|
||||
select V4L2_VP9
|
||||
select MEDIA_CONTROLLER
|
||||
select MEDIA_CONTROLLER_REQUEST_API
|
||||
help
|
||||
Mediatek video codec driver provides HW capability to
|
||||
encode and decode in a range of video formats on MT8173
|
||||
|
@ -6,7 +6,6 @@ config VIDEO_TEGRA_VDE
|
||||
select DMA_SHARED_BUFFER
|
||||
select IOMMU_IOVA
|
||||
select MEDIA_CONTROLLER
|
||||
select MEDIA_CONTROLLER_REQUEST_API
|
||||
select SRAM
|
||||
select VIDEOBUF2_DMA_CONTIG
|
||||
select VIDEOBUF2_DMA_SG
|
||||
|
@ -8,7 +8,6 @@ config VIDEO_HANTRO
|
||||
depends on V4L_MEM2MEM_DRIVERS
|
||||
depends on VIDEO_DEV
|
||||
select MEDIA_CONTROLLER
|
||||
select MEDIA_CONTROLLER_REQUEST_API
|
||||
select VIDEOBUF2_DMA_CONTIG
|
||||
select VIDEOBUF2_VMALLOC
|
||||
select V4L2_MEM2MEM_DEV
|
||||
|
@ -12,7 +12,6 @@ config VIDEO_VIM2M
|
||||
select VIDEOBUF2_VMALLOC
|
||||
select V4L2_MEM2MEM_DEV
|
||||
select MEDIA_CONTROLLER
|
||||
select MEDIA_CONTROLLER_REQUEST_API
|
||||
help
|
||||
This is a virtual test device for the memory-to-memory driver
|
||||
framework.
|
||||
|
@ -5,7 +5,6 @@ config VIDEO_VICODEC
|
||||
select VIDEOBUF2_VMALLOC
|
||||
select V4L2_MEM2MEM_DEV
|
||||
select MEDIA_CONTROLLER
|
||||
select MEDIA_CONTROLLER_REQUEST_API
|
||||
help
|
||||
Driver for a Virtual Codec
|
||||
|
||||
|
@ -7,7 +7,6 @@ config VIDEO_VISL
|
||||
select VIDEOBUF2_VMALLOC
|
||||
select V4L2_MEM2MEM_DEV
|
||||
select MEDIA_CONTROLLER
|
||||
select MEDIA_CONTROLLER_REQUEST_API
|
||||
select VIDEO_V4L2_TPG
|
||||
help
|
||||
|
||||
|
@ -10,7 +10,6 @@ config VIDEO_VIVID
|
||||
select VIDEOBUF2_DMA_CONTIG
|
||||
select VIDEO_V4L2_TPG
|
||||
select MEDIA_CONTROLLER
|
||||
select MEDIA_CONTROLLER_REQUEST_API
|
||||
help
|
||||
Enables a virtual video driver. This driver emulates a webcam,
|
||||
TV, S-Video and HDMI capture hardware, including VBI support for
|
||||
|
@ -4,7 +4,6 @@ config VIDEO_ROCKCHIP_VDEC
|
||||
depends on ARCH_ROCKCHIP || COMPILE_TEST
|
||||
depends on VIDEO_DEV
|
||||
select MEDIA_CONTROLLER
|
||||
select MEDIA_CONTROLLER_REQUEST_API
|
||||
select VIDEOBUF2_DMA_CONTIG
|
||||
select VIDEOBUF2_VMALLOC
|
||||
select V4L2_MEM2MEM_DEV
|
||||
|
@ -6,7 +6,6 @@ config VIDEO_SUNXI_CEDRUS
|
||||
depends on HAS_DMA
|
||||
depends on OF
|
||||
select MEDIA_CONTROLLER
|
||||
select MEDIA_CONTROLLER_REQUEST_API
|
||||
select SUNXI_SRAM
|
||||
select VIDEOBUF2_DMA_CONTIG
|
||||
select V4L2_MEM2MEM_DEV
|
||||
|
Loading…
Reference in New Issue
Block a user