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

Commit aad76013 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "Series of fixes for 3.10.  There are some usual driver fixes (mostly
  on s5p/exynos playform drivers), plus some fixes at V4L2 core"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (40 commits)
  [media] soc_camera: error dev remove and v4l2 call
  [media] sh_veu: fix the buffer size calculation
  [media] sh_veu: keep power supply until the m2m context is released
  [media] sh_veu: invoke v4l2_m2m_job_finish() even if a job has been aborted
  [media] v4l2-ioctl: don't print the clips list
  [media] v4l2-ctrls: V4L2_CTRL_CLASS_FM_RX controls are also valid radio controls
  [media] cx88: fix NULL pointer dereference
  [media] DocBook/media/v4l: update version number
  [media] exynos4-is: Remove "sysreg" clock handling
  [media] exynos4-is: Fix reported colorspace at FIMC-IS-ISP subdev
  [media] exynos4-is: Ensure fimc-is clocks are not enabled until properly configured
  [media] exynos4-is: Prevent NULL pointer dereference when firmware isn't loaded
  [media] s5p-mfc: Add NULL check for allocated buffer
  [media] s5p-mfc: added missing end-of-lines in debug messages
  [media] s5p-mfc: v4l2 controls setup routine moved to initialization code
  [media] s5p-mfc: separate encoder parameters for h264 and mpeg4
  [media] s5p-mfc: Remove special clock usage in driver
  [media] s5p-mfc: Remove unused s5p_mfc_get_decoded_status_v6() function
  [media] v4l2: mem2mem: save irq flags correctly
  [media] coda: v4l2-compliance fix: add VIDIOC_CREATE_BUFS support
  ...
parents f93f0b9c af44ad5e

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;

drivers/media/i2c/s5c73m3/s5c73m3-core.c

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ static int s5c73m3_oif_enum_frame_interval(struct v4l2_subdev *sd, 


	if (fie->pad != OIF_SOURCE_PAD)

		return -EINVAL;

	if (fie->index > ARRAY_SIZE(s5c73m3_intervals))

	if (fie->index >= ARRAY_SIZE(s5c73m3_intervals))

		return -EINVAL;



	mutex_lock(&state->lock);

drivers/media/pci/cx88/cx88-alsa.c

+3 −4
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static int snd_cx88_volume_put(struct snd_kcontrol *kcontrol, 
	int changed = 0;

	u32 old;



	if (core->board.audio_chip == V4L2_IDENT_WM8775)

	if (core->sd_wm8775)

		snd_cx88_wm8775_volume_put(kcontrol, value);



	left = value->value.integer.value[0] & 0x3f;
@@ -682,8 +682,7 @@ static int snd_cx88_switch_put(struct snd_kcontrol *kcontrol, 
		vol ^= bit;

		cx_swrite(SHADOW_AUD_VOL_CTL, AUD_VOL_CTL, vol);

		/* Pass mute onto any WM8775 */

		if ((core->board.audio_chip == V4L2_IDENT_WM8775) &&

		    ((1<<6) == bit))

		if (core->sd_wm8775 && ((1<<6) == bit))

			wm8775_s_ctrl(core, V4L2_CID_AUDIO_MUTE, 0 != (vol & bit));

		ret = 1;

	}
@@ -903,7 +902,7 @@ static int cx88_audio_initdev(struct pci_dev *pci, 
		goto error;



	/* If there's a wm8775 then add a Line-In ALC switch */

	if (core->board.audio_chip == V4L2_IDENT_WM8775)

	if (core->sd_wm8775)

		snd_ctl_add(card, snd_ctl_new1(&snd_cx88_alc_switch, chip));



	strcpy (card->driver, "CX88x");