Commit 73d21a35 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:

 - New driver for SK Hynix Hi-846 8M pixel camera

 - New driver for the ov13b10 camera

 - New driver for Renesas R-Car ISP

 - mtk-vcodec gained support for version 2 of decoder firmware ABI

 - The legacy sir_ir driver got removed

 - videobuf2: the vb2_mem_ops kAPI had some improvements

 - lots of cleanups, fixes and new features at device drivers

* tag 'media/v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (328 commits)
  media: venus: core: Add sdm660 DT compatible and resource struct
  media: dt-bindings: media: venus: Add sdm660 dt schema
  media: venus: vdec: decoded picture buffer handling during reconfig sequence
  media: venus: Handle fatal errors during encoding and decoding
  media: venus: helpers: Add helper to mark fatal vb2 error
  media: venus: hfi: Check for sys error on session hfi functions
  media: venus: Make sys_error flag an atomic bitops
  media: venus: venc: Use pmruntime autosuspend
  media: allegro: write vui parameters for HEVC
  media: allegro: nal-hevc: implement generator for vui
  media: allegro: write correct colorspace into SPS
  media: allegro: extract nal value lookup functions to header
  media: allegro: correctly scale the bit rate in SPS
  media: allegro: remove external QP table
  media: allegro: fix row and column in response message
  media: allegro: add control to disable encoder buffer
  media: allegro: add encoder buffer support
  media: allegro: add pm_runtime support
  media: allegro: lookup VCU settings
  media: allegro: fix module removal if initialization failed
  ...
parents 6f2b76a4 57c3b9f5

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ Douglas Gilbert <dougg@torque.net> 
Ed L. Cashin <ecashin@coraid.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Felipe W Damasio <felipewd@terra.com.br>

Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>

Documentation/admin-guide/media/i2c-cardlist.rst

+7 −1
Original line number Diff line number Diff line
@@ -58,15 +58,20 @@ Camera sensor devices 
============  ==========================================================

Driver        Name

============  ==========================================================

ccs           MIPI CCS compliant camera sensors (also SMIA++ and SMIA)

et8ek8        ET8EK8 camera sensor

hi556         Hynix Hi-556 sensor

hi846         Hynix Hi-846 sensor

imx208        Sony IMX208 sensor

imx214        Sony IMX214 sensor

imx219        Sony IMX219 sensor

imx258        Sony IMX258 sensor

imx274        Sony IMX274 sensor

imx290        Sony IMX290 sensor

imx319        Sony IMX319 sensor

imx334        Sony IMX334 sensor

imx355        Sony IMX355 sensor

imx412        Sony IMX412 sensor

m5mols        Fujitsu M-5MOLS 8MP sensor

mt9m001       mt9m001

mt9m032       MT9M032 camera sensor
@@ -79,6 +84,7 @@ mt9v032 Micron MT9V032 sensor 
mt9v111       Aptina MT9V111 sensor

noon010pc30   Siliconfile NOON010PC30 sensor

ov13858       OmniVision OV13858 sensor

ov13b10       OmniVision OV13B10 sensor

ov2640        OmniVision OV2640 sensor

ov2659        OmniVision OV2659 sensor

ov2680        OmniVision OV2680 sensor
@@ -104,7 +110,6 @@ s5k4ecgx Samsung S5K4ECGX sensor 
s5k5baf       Samsung S5K5BAF sensor

s5k6a3        Samsung S5K6A3 sensor

s5k6aa        Samsung S5K6AAFX sensor

smiapp        SMIA++/SMIA sensor

sr030pc30     Siliconfile SR030PC30 sensor

vs6624        ST VS6624 sensor

============  ==========================================================
@@ -138,6 +143,7 @@ Driver Name 
ad5820        AD5820 lens voice coil

ak7375        AK7375 lens voice coil

dw9714        DW9714 lens voice coil

dw9768        DW9768 lens voice coil

dw9807-vcm    DW9807 lens voice coil

============  ==========================================================

Documentation/admin-guide/media/imx7.rst

+60 −0
Original line number Diff line number Diff line
@@ -155,6 +155,66 @@ the resolutions supported by the sensor. 
	                [fmt:SBGGR10_1X10/800x600@1/30 field:none colorspace:srgb]

	                -> "imx7-mipi-csis.0":0 [ENABLED]



i.MX6ULL-EVK with OV5640

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



On this platform a parallel OV5640 sensor is connected to the CSI port.

The following example configures a video capture pipeline with an output

of 640x480 and UYVY8_2X8 format:



.. code-block:: none



   # Setup links

   media-ctl -l "'ov5640 1-003c':0 -> 'csi':0[1]"

   media-ctl -l "'csi':1 -> 'csi capture':0[1]"



   # Configure pads for pipeline

   media-ctl -v -V "'ov5640 1-003c':0 [fmt:UYVY8_2X8/640x480 field:none]"



After this streaming can start:



.. code-block:: none



   gst-launch-1.0 -v v4l2src device=/dev/video1 ! video/x-raw,format=UYVY,width=640,height=480 ! v4l2convert ! fbdevsink



.. code-block:: none



	# media-ctl -p

	Media controller API version 5.14.0



	Media device information

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

	driver          imx7-csi

	model           imx-media

	serial

	bus info

	hw revision     0x0

	driver version  5.14.0



	Device topology

	- entity 1: csi (2 pads, 2 links)

	            type V4L2 subdev subtype Unknown flags 0

	            device node name /dev/v4l-subdev0

	        pad0: Sink

	                [fmt:UYVY8_2X8/640x480 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]

	                <- "ov5640 1-003c":0 [ENABLED,IMMUTABLE]

	        pad1: Source

	                [fmt:UYVY8_2X8/640x480 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]

	                -> "csi capture":0 [ENABLED,IMMUTABLE]



	- entity 4: csi capture (1 pad, 1 link)

	            type Node subtype V4L flags 0

	            device node name /dev/video1

	        pad0: Sink

	                <- "csi":1 [ENABLED,IMMUTABLE]



	- entity 10: ov5640 1-003c (1 pad, 1 link)

	             type V4L2 subdev subtype Sensor flags 0

	             device node name /dev/v4l-subdev1

	        pad0: Source

	                [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range]

	                -> "csi":0 [ENABLED,IMMUTABLE]



References

----------

Documentation/admin-guide/media/ipu3.rst

+8 −6
Original line number Diff line number Diff line
@@ -51,10 +51,11 @@ to userspace as a V4L2 sub-device node and has two pads: 
.. tabularcolumns:: |p{0.8cm}|p{4.0cm}|p{4.0cm}|



.. flat-table::

    :header-rows: 1



    * - pad

      - direction

      - purpose

    * - Pad

      - Direction

      - Purpose



    * - 0

      - sink
@@ -148,10 +149,11 @@ Each pipe has two sink pads and three source pads for the following purpose: 
.. tabularcolumns:: |p{0.8cm}|p{4.0cm}|p{4.0cm}|



.. flat-table::

    :header-rows: 1



    * - pad

      - direction

      - purpose

    * - Pad

      - Direction

      - Purpose



    * - 0

      - sink

Documentation/admin-guide/media/ivtv.rst

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ whatever). Otherwise the device numbers can get confusing. The ivtv 
  Read-only



  The raw YUV video output from the current video input. The YUV format

  is non-standard (V4L2_PIX_FMT_HM12).

  is a 16x16 linear tiled NV12 format (V4L2_PIX_FMT_NV12_16L16)



  Note that the YUV and PCM streams are not synchronized, so they are of

  limited use.