Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
26cb92f7 ed5000fe

-22
-2
drivers/media/common/videobuf2/videobuf2-v4l2.c
··· 684 684 *caps |= V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF; 685 685 if (q->allow_cache_hints && q->io_modes & VB2_MMAP) 686 686 *caps |= V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS; 687 - #ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API 688 687 if (q->supports_requests) 689 688 *caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS; 690 - #endif 691 689 } 692 690 693 691 static void validate_memory_flags(struct vb2_queue *q,
-7
drivers/media/mc/Kconfig
··· 11 11 Enable the media controller API support for DVB. 12 12 13 13 This is currently experimental. 14 - 15 - config MEDIA_CONTROLLER_REQUEST_API 16 - bool 17 - depends on MEDIA_CONTROLLER 18 - help 19 - This option enables the Request API for the Media controller and V4L2 20 - interfaces. It is currently needed by a few stateless codec drivers.
-4
drivers/media/mc/mc-device.c
··· 372 372 373 373 static long media_device_request_alloc(struct media_device *mdev, void *arg) 374 374 { 375 - #ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API 376 375 int *alloc_fd = arg; 377 376 378 377 if (!mdev->ops || !mdev->ops->req_validate || !mdev->ops->req_queue) 379 378 return -ENOTTY; 380 379 381 380 return media_request_alloc(mdev, alloc_fd); 382 - #else 383 - return -ENOTTY; 384 - #endif 385 381 } 386 382 387 383 static long copy_arg_from_user(void *karg, void __user *uarg, unsigned int cmd)
-1
drivers/media/platform/mediatek/vcodec/Kconfig
··· 24 24 select V4L2_H264 25 25 select V4L2_VP9 26 26 select MEDIA_CONTROLLER 27 - select MEDIA_CONTROLLER_REQUEST_API 28 27 help 29 28 Mediatek video codec driver provides HW capability to 30 29 encode and decode in a range of video formats on MT8173
-1
drivers/media/platform/nvidia/tegra-vde/Kconfig
··· 6 6 select DMA_SHARED_BUFFER 7 7 select IOMMU_IOVA 8 8 select MEDIA_CONTROLLER 9 - select MEDIA_CONTROLLER_REQUEST_API 10 9 select SRAM 11 10 select VIDEOBUF2_DMA_CONTIG 12 11 select VIDEOBUF2_DMA_SG
-1
drivers/media/platform/verisilicon/Kconfig
··· 8 8 depends on V4L_MEM2MEM_DRIVERS 9 9 depends on VIDEO_DEV 10 10 select MEDIA_CONTROLLER 11 - select MEDIA_CONTROLLER_REQUEST_API 12 11 select VIDEOBUF2_DMA_CONTIG 13 12 select VIDEOBUF2_VMALLOC 14 13 select V4L2_MEM2MEM_DEV
-1
drivers/media/test-drivers/Kconfig
··· 12 12 select VIDEOBUF2_VMALLOC 13 13 select V4L2_MEM2MEM_DEV 14 14 select MEDIA_CONTROLLER 15 - select MEDIA_CONTROLLER_REQUEST_API 16 15 help 17 16 This is a virtual test device for the memory-to-memory driver 18 17 framework.
-1
drivers/media/test-drivers/vicodec/Kconfig
··· 5 5 select VIDEOBUF2_VMALLOC 6 6 select V4L2_MEM2MEM_DEV 7 7 select MEDIA_CONTROLLER 8 - select MEDIA_CONTROLLER_REQUEST_API 9 8 help 10 9 Driver for a Virtual Codec 11 10
-1
drivers/media/test-drivers/visl/Kconfig
··· 7 7 select VIDEOBUF2_VMALLOC 8 8 select V4L2_MEM2MEM_DEV 9 9 select MEDIA_CONTROLLER 10 - select MEDIA_CONTROLLER_REQUEST_API 11 10 select VIDEO_V4L2_TPG 12 11 help 13 12
-1
drivers/media/test-drivers/vivid/Kconfig
··· 10 10 select VIDEOBUF2_DMA_CONTIG 11 11 select VIDEO_V4L2_TPG 12 12 select MEDIA_CONTROLLER 13 - select MEDIA_CONTROLLER_REQUEST_API 14 13 help 15 14 Enables a virtual video driver. This driver emulates a webcam, 16 15 TV, S-Video and HDMI capture hardware, including VBI support for
-1
drivers/staging/media/rkvdec/Kconfig
··· 4 4 depends on ARCH_ROCKCHIP || COMPILE_TEST 5 5 depends on VIDEO_DEV 6 6 select MEDIA_CONTROLLER 7 - select MEDIA_CONTROLLER_REQUEST_API 8 7 select VIDEOBUF2_DMA_CONTIG 9 8 select VIDEOBUF2_VMALLOC 10 9 select V4L2_MEM2MEM_DEV
-1
drivers/staging/media/sunxi/cedrus/Kconfig
··· 6 6 depends on HAS_DMA 7 7 depends on OF 8 8 select MEDIA_CONTROLLER 9 - select MEDIA_CONTROLLER_REQUEST_API 10 9 select SUNXI_SRAM 11 10 select VIDEOBUF2_DMA_CONTIG 12 11 select V4L2_MEM2MEM_DEV