Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2183a588 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media updates from Mauro Carvalho Chehab:
 - Two new dvb frontend drivers: mn88472 and mn88473
 - A new driver for some PCIe DVBSky cards
 - A new remote controller driver: meson-ir
 - One LIRC staging driver got rewritten and promoted to mainstream:
   igorplugusb
 - A new tuner driver (m88rs6000t)
 - The old omap2 media driver got removed from staging.  This driver
   uses an old DMA API and it is likely broken on recent kernels.
   Nobody cared enough to fix it
 - Media bus format moved to a separate header, as DRM will also use the
   definitions there
 - mem2mem_testdev were renamed to vim2m, in order to use the same
   naming convention taken by the other virtual test driver (vivid)
 - Added a new driver for coda SoC (coda-jpeg)
 - The cx88 driver got converted to use videobuf2 core
 - Make DMABUF export buffer to work with DMA Scatter/Gather and Vmalloc
   cores
 - Lots of other fixes, improvements and cleanups on the drivers.

* tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (384 commits)
  [media] mn88473: One function call less in mn88473_init() after error
  [media] mn88473: Remove uneeded check before release_firmware()
  [media] lirc_zilog: Deletion of unnecessary checks before vfree()
  [media] MAINTAINERS: Add myself as img-ir maintainer
  [media] img-ir: Don't set driver's module owner
  [media] img-ir: Depend on METAG or MIPS or COMPILE_TEST
  [media] img-ir/hw: Drop [un]register_decoder declarations
  [media] img-ir/hw: Fix potential deadlock stopping timer
  [media] img-ir/hw: Always read data to clear buffer
  [media] redrat3: ensure dma is setup properly
  [media] ddbridge: remove unneeded check before dvb_unregister_device()
  [media] si2157: One function call less in si2157_init() after error
  [media] tuners: remove uneeded checks before release_firmware()
  [media] arm: omap2: rx51-peripherals: fix build warning
  [media] stv090x: add an extra protetion against buffer overflow
  [media] stv090x: Remove an unreachable code
  [media] stv090x: Some whitespace cleanups
  [media] em28xx: checkpatch cleanup: whitespaces/new lines cleanups
  [media] si2168: add support for firmware files in new format
  [media] si2168: debug printout for firmware version
  ...
parents e28870f9 71947828

Documentation/DocBook/media/dvb/dvbproperty.xml

+2 −2
Original line number Diff line number Diff line
@@ -120,8 +120,8 @@ struct dtv_properties { 
</para>

<informaltable><tgroup cols="1"><tbody><row><entry

 align="char">

<para>This ioctl call sets one or more frontend properties. This call only

 requires read-only access to the device.</para>

<para>This ioctl call sets one or more frontend properties. This call

 requires read/write access to the device.</para>

</entry>

 </row></tbody></tgroup></informaltable>

<para>SYNOPSIS

Documentation/DocBook/media/v4l/biblio.xml

+85 −0
Original line number Diff line number Diff line
@@ -178,6 +178,75 @@ Signal - NTSC for Studio Applications"</title> 
1125-Line High-Definition Production"</title>

    </biblioentry>



    <biblioentry id="srgb">

      <abbrev>sRGB</abbrev>

      <authorgroup>

	<corpauthor>International Electrotechnical Commission

(<ulink url="http://www.iec.ch">http://www.iec.ch</ulink>)</corpauthor>

      </authorgroup>

      <title>IEC 61966-2-1 ed1.0 "Multimedia systems and equipment - Colour measurement

and management - Part 2-1: Colour management - Default RGB colour space - sRGB"</title>

    </biblioentry>



    <biblioentry id="sycc">

      <abbrev>sYCC</abbrev>

      <authorgroup>

	<corpauthor>International Electrotechnical Commission

(<ulink url="http://www.iec.ch">http://www.iec.ch</ulink>)</corpauthor>

      </authorgroup>

      <title>IEC 61966-2-1-am1 ed1.0 "Amendment 1 - Multimedia systems and equipment - Colour measurement

and management - Part 2-1: Colour management - Default RGB colour space - sRGB"</title>

    </biblioentry>



    <biblioentry id="xvycc">

      <abbrev>xvYCC</abbrev>

      <authorgroup>

	<corpauthor>International Electrotechnical Commission

(<ulink url="http://www.iec.ch">http://www.iec.ch</ulink>)</corpauthor>

      </authorgroup>

      <title>IEC 61966-2-4 ed1.0 "Multimedia systems and equipment - Colour measurement

and management - Part 2-4: Colour management - Extended-gamut YCC colour space for video

applications - xvYCC"</title>

    </biblioentry>



    <biblioentry id="adobergb">

      <abbrev>AdobeRGB</abbrev>

      <authorgroup>

	<corpauthor>Adobe Systems Incorporated (<ulink url="http://www.adobe.com">http://www.adobe.com</ulink>)</corpauthor>

      </authorgroup>

      <title>Adobe&copy; RGB (1998) Color Image Encoding Version 2005-05</title>

    </biblioentry>



    <biblioentry id="oprgb">

      <abbrev>opRGB</abbrev>

      <authorgroup>

	<corpauthor>International Electrotechnical Commission

(<ulink url="http://www.iec.ch">http://www.iec.ch</ulink>)</corpauthor>

      </authorgroup>

      <title>IEC 61966-2-5 "Multimedia systems and equipment - Colour measurement

and management - Part 2-5: Colour management - Optional RGB colour space - opRGB"</title>

    </biblioentry>



    <biblioentry id="itu2020">

      <abbrev>ITU&nbsp;BT.2020</abbrev>

      <authorgroup>

	<corpauthor>International Telecommunication Union (<ulink

url="http://www.itu.ch">http://www.itu.ch</ulink>)</corpauthor>

      </authorgroup>

      <title>ITU-R Recommendation BT.2020 (08/2012) "Parameter values for ultra-high

definition television systems for production and international programme exchange"

</title>

    </biblioentry>



    <biblioentry id="tech3213">

      <abbrev>EBU&nbsp;Tech&nbsp;3213</abbrev>

      <authorgroup>

	<corpauthor>European Broadcast Union (<ulink

url="http://www.ebu.ch">http://www.ebu.ch</ulink>)</corpauthor>

      </authorgroup>

      <title>E.B.U. Standard for Chromaticity Tolerances for Studio Monitors"</title>

    </biblioentry>



    <biblioentry id="iec62106">

      <abbrev>IEC&nbsp;62106</abbrev>

      <authorgroup>
@@ -266,4 +335,20 @@ in the frequency range from 87,5 to 108,0 MHz</title> 
      <subtitle>Version 1, Revision 2</subtitle>

    </biblioentry>



    <biblioentry id="poynton">

      <abbrev>poynton</abbrev>

      <authorgroup>

	<corpauthor>Charles Poynton</corpauthor>

      </authorgroup>

      <title>Digital Video and HDTV, Algorithms and Interfaces</title>

    </biblioentry>



    <biblioentry id="colimg">

      <abbrev>colimg</abbrev>

      <authorgroup>

	<corpauthor>Erik Reinhard et al.</corpauthor>

      </authorgroup>

      <title>Color Imaging: Fundamentals and Applications</title>

    </biblioentry>



  </bibliography>

Documentation/DocBook/media/v4l/dev-subdev.xml

+63 −46
Original line number Diff line number Diff line
@@ -195,53 +195,59 @@ 
	<title>Sample Pipeline Configuration</title>

	<tgroup cols="3">

	  <colspec colname="what"/>

	  <colspec colname="sensor-0" />

	  <colspec colname="frontend-0" />

	  <colspec colname="frontend-1" />

	  <colspec colname="scaler-0" />

	  <colspec colname="scaler-1" />

	  <colspec colname="sensor-0 format" />

	  <colspec colname="frontend-0 format" />

	  <colspec colname="frontend-1 format" />

	  <colspec colname="scaler-0 format" />

	  <colspec colname="scaler-0 compose" />

	  <colspec colname="scaler-1 format" />

	  <thead>

	    <row>

	      <entry></entry>

	      <entry>Sensor/0</entry>

	      <entry>Frontend/0</entry>

	      <entry>Frontend/1</entry>

	      <entry>Scaler/0</entry>

	      <entry>Scaler/1</entry>

	      <entry>Sensor/0 format</entry>

	      <entry>Frontend/0 format</entry>

	      <entry>Frontend/1 format</entry>

	      <entry>Scaler/0 format</entry>

	      <entry>Scaler/0 compose selection rectangle</entry>

	      <entry>Scaler/1 format</entry>

	    </row>

	  </thead>

	  <tbody valign="top">

	    <row>

	      <entry>Initial state</entry>

	      <entry>2048x1536</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>2048x1536/SGRBG8_1X8</entry>

	      <entry>(default)</entry>

	      <entry>(default)</entry>

	      <entry>(default)</entry>

	      <entry>(default)</entry>

	      <entry>(default)</entry>

	    </row>

	    <row>

	      <entry>Configure frontend input</entry>

	      <entry>2048x1536</entry>

	      <entry><emphasis>2048x1536</emphasis></entry>

	      <entry><emphasis>2046x1534</emphasis></entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>Configure frontend sink format</entry>

	      <entry>2048x1536/SGRBG8_1X8</entry>

	      <entry><emphasis>2048x1536/SGRBG8_1X8</emphasis></entry>

	      <entry><emphasis>2046x1534/SGRBG8_1X8</emphasis></entry>

	      <entry>(default)</entry>

	      <entry>(default)</entry>

	      <entry>(default)</entry>

	    </row>

	    <row>

	      <entry>Configure scaler input</entry>

	      <entry>2048x1536</entry>

	      <entry>2048x1536</entry>

	      <entry>2046x1534</entry>

	      <entry><emphasis>2046x1534</emphasis></entry>

	      <entry><emphasis>2046x1534</emphasis></entry>

	      <entry>Configure scaler sink format</entry>

	      <entry>2048x1536/SGRBG8_1X8</entry>

	      <entry>2048x1536/SGRBG8_1X8</entry>

	      <entry>2046x1534/SGRBG8_1X8</entry>

	      <entry><emphasis>2046x1534/SGRBG8_1X8</emphasis></entry>

	      <entry><emphasis>0,0/2046x1534</emphasis></entry>

	      <entry><emphasis>2046x1534/SGRBG8_1X8</emphasis></entry>

	    </row>

	    <row>

	      <entry>Configure scaler output</entry>

	      <entry>2048x1536</entry>

	      <entry>2048x1536</entry>

	      <entry>2046x1534</entry>

	      <entry>2046x1534</entry>

	      <entry><emphasis>1280x960</emphasis></entry>

	      <entry>Configure scaler sink compose selection</entry>

	      <entry>2048x1536/SGRBG8_1X8</entry>

	      <entry>2048x1536/SGRBG8_1X8</entry>

	      <entry>2046x1534/SGRBG8_1X8</entry>

	      <entry>2046x1534/SGRBG8_1X8</entry>

	      <entry><emphasis>0,0/1280x960</emphasis></entry>

	      <entry><emphasis>1280x960/SGRBG8_1X8</emphasis></entry>

	    </row>

	  </tbody>

	</tgroup>
@@ -249,19 +255,30 @@ 


      <para>

      <orderedlist>

	<listitem><para>Initial state. The sensor output is set to its native 3MP

	resolution. Resolutions on the host frontend and scaler input and output

	pads are undefined.</para></listitem>

	<listitem><para>The application configures the frontend input pad resolution to

	2048x1536. The driver propagates the format to the frontend output pad.

	Note that the propagated output format can be different, as in this case,

	than the input format, as the hardware might need to crop pixels (for

	instance when converting a Bayer filter pattern to RGB or YUV).</para></listitem>

	<listitem><para>The application configures the scaler input pad resolution to

	2046x1534 to match the frontend output resolution. The driver propagates

	the format to the scaler output pad.</para></listitem>

	<listitem><para>The application configures the scaler output pad resolution to

	1280x960.</para></listitem>

	<listitem><para>Initial state. The sensor source pad format is

	set to its native 3MP size and V4L2_MBUS_FMT_SGRBG8_1X8

	media bus code. Formats on the host frontend and scaler sink

	and source pads have the default values, as well as the

	compose rectangle on the scaler's sink pad.</para></listitem>



	<listitem><para>The application configures the frontend sink

	pad format's size to 2048x1536 and its media bus code to

	V4L2_MBUS_FMT_SGRBG_1X8. The driver propagates the format to

	the frontend source pad.</para></listitem>



	<listitem><para>The application configures the scaler sink pad

	format's size to 2046x1534 and the media bus code to

	V4L2_MBUS_FMT_SGRBG_1X8 to match the frontend source size and

	media bus code. The media bus code on the sink pad is set to

	V4L2_MBUS_FMT_SGRBG_1X8. The driver propagates the size to the

	compose selection rectangle on the scaler's sink pad, and the

	format to the scaler source pad.</para></listitem>



	<listitem><para>The application configures the size of the compose

	selection rectangle of the scaler's sink pad 1280x960. The driver

	propagates the size to the scaler's source pad

	format.</para></listitem>



      </orderedlist>

      </para>

Documentation/DocBook/media/v4l/io.xml

+4 −1
Original line number Diff line number Diff line
@@ -1422,7 +1422,10 @@ one of the <constant>V4L2_FIELD_NONE</constant>, 
<constant>V4L2_FIELD_BOTTOM</constant>, or

<constant>V4L2_FIELD_INTERLACED</constant> formats is acceptable.

Drivers choose depending on hardware capabilities or e.&nbsp;g. the

requested image size, and return the actual field order. &v4l2-buffer;

requested image size, and return the actual field order. Drivers must

never return <constant>V4L2_FIELD_ANY</constant>. If multiple

field orders are possible the driver must choose one of the possible

field orders during &VIDIOC-S-FMT; or &VIDIOC-TRY-FMT;. &v4l2-buffer;

<structfield>field</structfield> can never be

<constant>V4L2_FIELD_ANY</constant>.</entry>

	  </row>

Documentation/DocBook/media/v4l/pixfmt.xml

+967 −307

File changed.

Preview size limit exceeded, changes collapsed.