Commit 3c41df42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents defaf1a2 e2ed5369

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

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ are often referred to as greyscale formats. 


.. 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

    :header-rows: 1

drivers/media/pci/intel/ipu6/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -3,13 +3,14 @@ config VIDEO_INTEL_IPU6 
	depends on ACPI || COMPILE_TEST

	depends on VIDEO_DEV

	depends on X86 && X86_64 && HAS_DMA

	depends on IPU_BRIDGE || !IPU_BRIDGE

	select AUXILIARY_BUS

	select DMA_OPS

	select IOMMU_IOVA

	select VIDEO_V4L2_SUBDEV_API

	select MEDIA_CONTROLLER

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_FWNODE

	select IPU_BRIDGE

	help

	  This is the 6th Gen Intel Image Processing Unit, found in Intel SoCs

	  and used for capturing images and video from camera sensors.

drivers/media/usb/uvc/uvc_ctrl.c

+5 −3
Original line number Diff line number Diff line
@@ -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) {

		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. */

		if (mapping->filter_mapping) {

			mapping = mapping->filter_mapping(chain, ctrl);
@@ -2687,8 +2691,6 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, 
				continue;

		}



		if (uvc_entity_match_guid(ctrl->entity, mapping->entity) &&

		    ctrl->info.selector == mapping->selector)

		__uvc_ctrl_add_mapping(chain, ctrl, mapping);

	}

}