Commit c81652a4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'br-v5.18q' of git://linuxtv.org/hverkuil/media_tree into media_stage 

Tag branch

* tag 'br-v5.18q' of git://linuxtv.org/hverkuil/media_tree

:
  media: cec: seco: Drop pointless include
  media: hantro: sunxi: Fix VP9 steps
  media: imx: csis: Store pads format separately
  doc: media: Document VP9 reference_mode miss-placement
  doc: media: Document MM21 tiled format
  media: imx: imx8mq-mipi-csi2: Remove YUV422 2X8
  media: v4l2-core: Initialize h264 scaling matrix
  media: imx: imx-mipi-csis: Add output format
  media: imx: imx-mipi-csis: Add BGR888
  media: imx: imx-mipi-csis: Add RGB565_1X16
  media: imx: imx-mipi-csis: Set PIXEL_MODE for YUV422
  media: imx: imx7-media-csi: Use dual sampling for YUV 1X16
  media: imx: Rename imx7-mipi-csis.c to imx-mipi-csis.c
  media: imx: De-stage imx7-mipi-csis

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parents 8268d067 0bff66dc

Documentation/admin-guide/media/imx7.rst

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ reference manual [#f1]_. 
Entities

--------



imx7-mipi-csi2

imx-mipi-csi2

--------------



This is the MIPI CSI-2 receiver entity. It has one sink pad to receive the pixel

Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml→Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/media/nxp,imx7-mipi-csi2.yaml#

$id: http://devicetree.org/schemas/media/nxp,imx-mipi-csi2.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: NXP i.MX7 and i.MX8 MIPI CSI-2 receiver

Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst

+6 −1
Original line number Diff line number Diff line
@@ -1698,7 +1698,12 @@ See section '7.3.1 Tx mode semantics' of the :ref:`vp9` specification for more d 
    * - __u8

      - ``reference_mode``

      - Specifies the type of inter prediction to be used. See

        :ref:`Reference Mode<vp9_reference_mode>` for more details.

        :ref:`Reference Mode<vp9_reference_mode>` for more details. Note that

	this is derived as part of the compressed header parsing process and

	for this reason should have been part of

	:c:type: `v4l2_ctrl_vp9_compressed_hdr` optional control. It is safe to

	set this value to zero if the driver does not require compressed

	headers.

    * - __u8

      - ``reserved[7]``

      - Applications and drivers must set this to zero.

Documentation/userspace-api/media/v4l/pixfmt-reserved.rst

+4 −11
Original line number Diff line number Diff line
@@ -233,19 +233,12 @@ please make a proposal on the linux-media mailing list. 


      - ``V4L2_PIX_FMT_MT21C``

      - 'MT21'

      - Compressed two-planar YVU420 format used by Mediatek MT8173.

	The compression is lossless.

	It is an opaque intermediate format and the MDP hardware must be

      - Compressed two-planar YVU420 format used by Mediatek MT8173, MT8192,

        MT8195 and more. The compression is lossless. This format have

	similitude with ``V4L2_PIX_FMT_MM21`` in term of alignment and tiling.

	It remains an opaque intermediate format and the MDP hardware must be

	used to convert ``V4L2_PIX_FMT_MT21C`` to ``V4L2_PIX_FMT_NV12M``,

	``V4L2_PIX_FMT_YUV420M`` or ``V4L2_PIX_FMT_YVU420``.

    * .. _V4L2-PIX-FMT-MM21:



      - ``V4L2_PIX_FMT_MM21``

      - 'MM21'

      - Non-compressed, tiled two-planar format used by Mediatek MT8183.

	This is an opaque intermediate format and the MDP3 hardware can be

	used to convert it to other formats.



.. raw:: latex



    \normalsize

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

+6 −0
Original line number Diff line number Diff line
@@ -296,6 +296,12 @@ tiles linearly in memory. The line stride and image height must be 
aligned to a multiple of 32. The layouts of the luma and chroma planes are

identical.



``V4L2_PIX_FMT_MM21`` store luma pixel in 16x32 tiles, and chroma pixels

in 16x16 tiles. The line stride must be aligned to a multiple of 16 and the

image height must be aligned to a multiple of 32. The number of luma and chroma

tiles are identical, even though the tile size differ. The image is formed of

two non-contiguous planes.



.. _nv12mt:



.. kernel-figure:: nv12mt.svg