iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'media/v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Browse Source 
Pull media fixes from Mauro Carvalho Chehab:

 - two Kconfig fixes

 - one fix for the UVC driver addressing probing time detection of a UVC
   custom controls

 - one fix related to PDF generation

* tag 'media/v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: v4l: Fix missing tabular column hint for Y14P format
  media: intel/ipu6: select AUXILIARY_BUS in Kconfig
  media: ipu-bridge: fix ipu6 Kconfig dependencies
  media: uvcvideo: Fix custom control mapping probing
This commit is contained in:
Linus Torvalds
2024-08-04 08:12:33 -07:00
parent defaf1a211 e2ed53694e
commit 3c41df428e
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst
View File

@ -21,9 +21,9 @@ are often referred to as greyscale formats.
.. raw:: latex .. raw:: latex
\scriptsize \tiny
.. tabularcolumns:: |p{3.6cm}|p{3.0cm}|p{1.3cm}|p{2.6cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}| .. tabularcolumns:: |p{3.6cm}|p{2.4cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|
.. flat-table:: Luma-Only Image Formats .. flat-table:: Luma-Only Image Formats
:header-rows: 1 :header-rows: 1

3
drivers/media/pci/intel/ipu6/Kconfig
View File

@ -3,13 +3,14 @@ config VIDEO_INTEL_IPU6
depends on ACPI || COMPILE_TEST depends on ACPI || COMPILE_TEST
depends on VIDEO_DEV depends on VIDEO_DEV
depends on X86 && X86_64 && HAS_DMA depends on X86 && X86_64 && HAS_DMA
depends on IPU_BRIDGE || !IPU_BRIDGE
select AUXILIARY_BUS
select DMA_OPS select DMA_OPS
select IOMMU_IOVA select IOMMU_IOVA
select VIDEO_V4L2_SUBDEV_API select VIDEO_V4L2_SUBDEV_API
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_CONTIG
select V4L2_FWNODE select V4L2_FWNODE
select IPU_BRIDGE
help help
This is the 6th Gen Intel Image Processing Unit, found in Intel SoCs This is the 6th Gen Intel Image Processing Unit, found in Intel SoCs
and used for capturing images and video from camera sensors. and used for capturing images and video from camera sensors.

8
drivers/media/usb/uvc/uvc_ctrl.c
View File

@ -2680,6 +2680,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) {
const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i]; const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i];
if (!uvc_entity_match_guid(ctrl->entity, mapping->entity) ||
ctrl->info.selector != mapping->selector)
continue;
/* Let the device provide a custom mapping. */ /* Let the device provide a custom mapping. */
if (mapping->filter_mapping) { if (mapping->filter_mapping) {
mapping = mapping->filter_mapping(chain, ctrl); mapping = mapping->filter_mapping(chain, ctrl);
@ -2687,9 +2691,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
continue; continue;
} }
if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && __uvc_ctrl_add_mapping(chain, ctrl, mapping);
ctrl->info.selector == mapping->selector)
__uvc_ctrl_add_mapping(chain, ctrl, mapping);
} }
} }