Commit 06e68fed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:

 - add a missing include at v4l2-controls uAPI header

 - minor kAPI update for the request API

 - some fixes at CEC core

 - use a lower minimum height for the virtual codec driver

 - cleanup a gcc warning due to the lack of a fall though markup

 - tc358743: Remove unnecessary self assignment

 - fix the V4L event subscription logic

 - docs: Document metadata format in struct v4l2_format

 - omap3isp and ipu3-cio2: fix unbinding logic

* tag 'media/v4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: ipu3-cio2: Use cio2_queues_exit
  media: ipu3-cio2: Unregister device nodes first, then release resources
  media: omap3isp: Unregister media device as first
  media: docs: Document metadata format in struct v4l2_format
  media: v4l: event: Add subscription to list before calling "add" operation
  media: dm365_ipipeif: better annotate a fall though
  media: Rename vb2_m2m_request_queue -> v4l2_m2m_request_queue
  media: cec: increase debug level for 'queue full'
  media: cec: check for non-OK/NACK conditions while claiming a LA
  media: vicodec: lower minimum height to 360
  media: tc358743: Remove unnecessary self assignment
  media: v4l: fix uapi mpeg slice params definition
  v4l2-controls: add a missing include
parents f2ce1065 4e26f692

Documentation/media/uapi/v4l/dev-meta.rst

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ To use the :ref:`format` ioctls applications set the ``type`` field of the 
the desired operation. Both drivers and applications must set the remainder of

the :c:type:`v4l2_format` structure to 0.



.. _v4l2-meta-format:

.. c:type:: v4l2_meta_format



.. tabularcolumns:: |p{1.4cm}|p{2.2cm}|p{13.9cm}|

Documentation/media/uapi/v4l/vidioc-g-fmt.rst

+5 −0
Original line number Diff line number Diff line
@@ -132,6 +132,11 @@ The format as returned by :ref:`VIDIOC_TRY_FMT <VIDIOC_G_FMT>` must be identical 
      - ``sdr``

      - Definition of a data format, see :ref:`pixfmt`, used by SDR

	capture and output devices.

    * -

      - struct :c:type:`v4l2_meta_format`

      - ``meta``

      - Definition of a metadata format, see :ref:`meta-formats`, used by

	metadata capture devices.

    * -

      - __u8

      - ``raw_data``\ [200]

drivers/media/cec/cec-adap.c

+38 −11
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ int cec_transmit_msg_fh(struct cec_adapter *adap, struct cec_msg *msg, 
	}



	if (adap->transmit_queue_sz >= CEC_MAX_MSG_TX_QUEUE_SZ) {

		dprintk(1, "%s: transmit queue full\n", __func__);

		dprintk(2, "%s: transmit queue full\n", __func__);

		return -EBUSY;

	}
@@ -1180,6 +1180,8 @@ static int cec_config_log_addr(struct cec_adapter *adap, 
{

	struct cec_log_addrs *las = &adap->log_addrs;

	struct cec_msg msg = { };

	const unsigned int max_retries = 2;

	unsigned int i;

	int err;



	if (cec_has_log_addr(adap, log_addr))
@@ -1188,6 +1190,8 @@ static int cec_config_log_addr(struct cec_adapter *adap, 
	/* Send poll message */

	msg.len = 1;

	msg.msg[0] = (log_addr << 4) | log_addr;



	for (i = 0; i < max_retries; i++) {

		err = cec_transmit_msg_fh(adap, &msg, NULL, true);



		/*
@@ -1200,8 +1204,31 @@ static int cec_config_log_addr(struct cec_adapter *adap, 
		if (err)

			return err;



		/*

		 * The message was aborted due to a disconnect or

		 * unconfigure, just bail out.

		 */

		if (msg.tx_status & CEC_TX_STATUS_ABORTED)

			return -EINTR;

		if (msg.tx_status & CEC_TX_STATUS_OK)

			return 0;

		if (msg.tx_status & CEC_TX_STATUS_NACK)

			break;

		/*

		 * Retry up to max_retries times if the message was neither

		 * OKed or NACKed. This can happen due to e.g. a Lost

		 * Arbitration condition.

		 */

	}



	/*

	 * If we are unable to get an OK or a NACK after max_retries attempts

	 * (and note that each attempt already consists of four polls), then

	 * then we assume that something is really weird and that it is not a

	 * good idea to try and claim this logical address.

	 */

	if (i == max_retries)

		return 0;



	/*

	 * Message not acknowledged, so this logical

drivers/media/i2c/tc358743.c

+0 −1
Original line number Diff line number Diff line
@@ -1918,7 +1918,6 @@ static int tc358743_probe_of(struct tc358743_state *state) 
	ret = v4l2_fwnode_endpoint_alloc_parse(of_fwnode_handle(ep), &endpoint);

	if (ret) {

		dev_err(dev, "failed to parse endpoint\n");

		ret = ret;

		goto put_node;

	}

drivers/media/pci/intel/ipu3/ipu3-cio2.c

+2 −4
Original line number Diff line number Diff line
@@ -1844,14 +1844,12 @@ fail_mutex_destroy: 
static void cio2_pci_remove(struct pci_dev *pci_dev)

{

	struct cio2_device *cio2 = pci_get_drvdata(pci_dev);

	unsigned int i;



	media_device_unregister(&cio2->media_dev);

	cio2_notifier_exit(cio2);

	cio2_queues_exit(cio2);

	cio2_fbpt_exit_dummy(cio2);

	for (i = 0; i < CIO2_QUEUES; i++)

		cio2_queue_exit(cio2, &cio2->queue[i]);

	v4l2_device_unregister(&cio2->v4l2_dev);

	media_device_unregister(&cio2->media_dev);

	media_device_cleanup(&cio2->media_dev);

	mutex_destroy(&cio2->lock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE