Commit ac911b31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more media updates from Mauro Carvalho Chehab:

 - a set of atomisp patches. They remove several abstraction layers, and
   fixes clang and gcc warnings (that were hidden via some macros that
   were disabling 4 or 5 types of warnings there). There are also some
   important fixes and sensor auto-detection on newer BIOSes via ACPI
   _DCM tables.

 - some fixes

* tag 'media/v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (95 commits)
  media: rkvdec: Fix H264 scaling list order
  media: v4l2-ctrls: Unset correct HEVC loop filter flag
  media: videobuf2-dma-contig: fix bad kfree in vb2_dma_contig_clear_max_seg_size
  media: v4l2-subdev.rst: correct information about v4l2 events
  media: s5p-mfc: Properly handle dma_parms for the allocated devices
  media: medium: cec: Make MEDIA_CEC_SUPPORT default to n if !MEDIA_SUPPORT
  media: cedrus: Implement runtime PM
  media: cedrus: Program output format during each run
  media: atomisp: improve ACPI/DMI detection logs
  media: Revert "media: atomisp: add Asus Transform T101HA ACPI vars"
  media: Revert "media: atomisp: Add some ACPI detection info"
  media: atomisp: improve sensor detection code to use _DSM table
  media: atomisp: get rid of an iomem abstraction layer
  media: atomisp: get rid of a string_support.h abstraction layer
  media: atomisp: use strscpy() instead of less secure variants
  media: atomisp: set DFS to MAX if sensor doesn't report fps
  media: atomisp: use different dfs failed messages
  media: atomisp: change the detection of ISP2401 at runtime
  media: atomisp: use macros from intel-family.h
  media: atomisp: don't set hpll_freq twice with different values
  ...
parents d74b15db 2630e1bb

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

+1 −2
Original line number Diff line number Diff line
@@ -319,8 +319,7 @@ The device node handles a subset of the V4L2 API. 
	events can also be reported by one (or several) V4L2 device nodes.



	Sub-device drivers that want to use events need to set the

	``V4L2_SUBDEV_USES_EVENTS`` :c:type:`v4l2_subdev`.flags and initialize

	:c:type:`v4l2_subdev`.nevents to events queue depth before registering

	``V4L2_SUBDEV_FL_HAS_EVENTS`` :c:type:`v4l2_subdev`.flags before registering

	the sub-device. After registration events can be queued as usual on the

	:c:type:`v4l2_subdev`.devnode device node.

drivers/media/cec/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ config CEC_PIN_ERROR_INJ 
menuconfig MEDIA_CEC_SUPPORT

	bool

	prompt "HDMI CEC drivers"

	default y if !MEDIA_SUPPORT_FILTER

	default y if MEDIA_SUPPORT && !MEDIA_SUPPORT_FILTER

	help

	  Enable support for HDMI CEC (Consumer Electronics Control),

	  which is an optional HDMI feature.

drivers/media/common/videobuf2/videobuf2-dma-contig.c

+2 −18
Original line number Diff line number Diff line
@@ -726,9 +726,8 @@ EXPORT_SYMBOL_GPL(vb2_dma_contig_memops); 
int vb2_dma_contig_set_max_seg_size(struct device *dev, unsigned int size)

{

	if (!dev->dma_parms) {

		dev->dma_parms = kzalloc(sizeof(*dev->dma_parms), GFP_KERNEL);

		if (!dev->dma_parms)

			return -ENOMEM;

		dev_err(dev, "Failed to set max_seg_size: dma_parms is NULL\n");

		return -ENODEV;

	}

	if (dma_get_max_seg_size(dev) < size)

		return dma_set_max_seg_size(dev, size);
@@ -737,21 +736,6 @@ int vb2_dma_contig_set_max_seg_size(struct device *dev, unsigned int size) 
}

EXPORT_SYMBOL_GPL(vb2_dma_contig_set_max_seg_size);



/*

 * vb2_dma_contig_clear_max_seg_size() - release resources for DMA parameters

 * @dev:	device for configuring DMA parameters

 *

 * This function releases resources allocated to configure DMA parameters

 * (see vb2_dma_contig_set_max_seg_size() function). It should be called from

 * device drivers on driver remove.

 */

void vb2_dma_contig_clear_max_seg_size(struct device *dev)

{

	kfree(dev->dma_parms);

	dev->dma_parms = NULL;

}

EXPORT_SYMBOL_GPL(vb2_dma_contig_clear_max_seg_size);



MODULE_DESCRIPTION("DMA-contig memory handling routines for videobuf2");

MODULE_AUTHOR("Pawel Osciak <pawel@osciak.com>");

MODULE_LICENSE("GPL");

drivers/media/platform/s5p-mfc/s5p_mfc.c

+5 −1
Original line number Diff line number Diff line
@@ -1089,6 +1089,10 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev, 
	child->coherent_dma_mask = dev->coherent_dma_mask;

	child->dma_mask = dev->dma_mask;

	child->release = s5p_mfc_memdev_release;

	child->dma_parms = devm_kzalloc(dev, sizeof(*child->dma_parms),

					GFP_KERNEL);

	if (!child->dma_parms)

		goto err;



	/*

	 * The memdevs are not proper OF platform devices, so in order for them
@@ -1104,7 +1108,7 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev, 
			return child;

		device_del(child);

	}



err:

	put_device(child);

	return NULL;

}

drivers/media/v4l2-core/v4l2-ctrls.c

+1 −1
Original line number Diff line number Diff line
@@ -1844,7 +1844,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, 
			       sizeof(p_hevc_pps->row_height_minus1));



			p_hevc_pps->flags &=

				~V4L2_HEVC_PPS_FLAG_PPS_LOOP_FILTER_ACROSS_SLICES_ENABLED;

				~V4L2_HEVC_PPS_FLAG_LOOP_FILTER_ACROSS_TILES_ENABLED;

		}



		if (p_hevc_pps->flags &