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

Commit 24a72aca authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge tag 'v3.10' into next 

Merge 3.10 in order to get some of the last minute powerpc
changes, resolve conflicts and add additional fixes on top
of them.
parents 6e0b8bc9 8bb495e3

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

+22 −13
Original line number Diff line number Diff line 
  <title>Codec Interface</title>



  <note>

    <title>Suspended</title>

  <para>A V4L2 codec can compress, decompress, transform, or otherwise

convert video data from one format into another format, in memory. Typically

such devices are memory-to-memory devices (i.e. devices with the

<constant>V4L2_CAP_VIDEO_M2M</constant> or <constant>V4L2_CAP_VIDEO_M2M_MPLANE</constant>

capability set).

</para>



    <para>This interface has been be suspended from the V4L2 API

implemented in Linux 2.6 until we have more experience with codec

device interfaces.</para>

  </note>

  <para>A memory-to-memory video node acts just like a normal video node, but it

supports both output (sending frames from memory to the codec hardware) and

capture (receiving the processed frames from the codec hardware into memory)

stream I/O. An application will have to setup the stream

I/O for both sides and finally call &VIDIOC-STREAMON; for both capture and output

to start the codec.</para>



  <para>A V4L2 codec can compress, decompress, transform, or otherwise

convert video data from one format into another format, in memory.

Applications send data to be converted to the driver through a

&func-write; call, and receive the converted data through a

&func-read; call. For efficiency a driver may also support streaming

I/O.</para>

  <para>Video compression codecs use the MPEG controls to setup their codec parameters

(note that the MPEG controls actually support many more codecs than just MPEG).

See <xref linkend="mpeg-controls"></xref>.</para>



  <para>[to do]</para>
 
  <para>Memory-to-memory devices can often be used as a shared resource: you can

open the video node multiple times, each application setting up their own codec properties

that are local to the file handle, and each can use it independently from the others.

The driver will arbitrate access to the codec and reprogram it whenever another file

handler gets access. This is different from the usual video node behavior where the video properties

are global to the device (i.e. changing something through one file handle is visible

through another file handle).</para>

Documentation/DocBook/media/v4l/v4l2.xml

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ and discussions on the V4L mailing list.</revremark> 
</partinfo>



<title>Video for Linux Two API Specification</title>

 <subtitle>Revision 3.9</subtitle>

 <subtitle>Revision 3.10</subtitle>



  <chapter id="common">

    &sub-common;

Documentation/devicetree/bindings/media/exynos-fimc-lite.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Exynos4x12/Exynos5 SoC series camera host interface (FIMC-LITE) 


Required properties:



- compatible	: should be "samsung,exynos4212-fimc" for Exynos4212 and

- compatible	: should be "samsung,exynos4212-fimc-lite" for Exynos4212 and

		  Exynos4412 SoCs;

- reg		: physical base address and size of the device memory mapped

		  registers;

Documentation/networking/ip-sysctl.txt

+2 −2
Original line number Diff line number Diff line
@@ -420,10 +420,10 @@ tcp_synack_retries - INTEGER 
	for a passive TCP connection will happen after 63seconds.



tcp_syncookies - BOOLEAN

	Only valid when the kernel was compiled with CONFIG_SYNCOOKIES

	Only valid when the kernel was compiled with CONFIG_SYN_COOKIES

	Send out syncookies when the syn backlog queue of a socket

	overflows. This is to prevent against the common 'SYN flood attack'

	Default: FALSE

	Default: 1



	Note, that syncookies is fallback facility.

	It MUST NOT be used to help highly loaded servers to stand

Documentation/sound/alsa/HD-Audio-Models.txt

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ ALC269/270/275/276/280/282 
  alc271-dmic	Enable ALC271X digital mic workaround

  inv-dmic	Inverted internal mic workaround

  lenovo-dock   Enables docking station I/O for some Lenovos

  dell-headset-multi	Headset jack, which can also be used as mic-in

  dell-headset-dock	Headset jack (without mic-in), and also dock I/O



ALC662/663/272

==============
@@ -42,6 +44,7 @@ ALC662/663/272 
  asus-mode7	ASUS

  asus-mode8	ASUS

  inv-dmic	Inverted internal mic workaround

  dell-headset-multi	Headset jack, which can also be used as mic-in



ALC680

======