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

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

Pull media updates from Mauro Carvalho Chehab:
 "Media updates, including:

   - Lots of improvements at the kABI documentation
   - Split of Videobuf2 into a common part and a V4L2 specific one
   - Split of the VB2 tracing events into a separate header file
   - s5p-mfc got support for Exynos 5433
   - v4l2 fixes for 64-bits alignment when running 32 bits userspace
     on ARM
   - Added support for SDR radio transmitter at core, vivid and hackrf
     drivers
   - Some y2038 fixups
   - Some improvements at V4L2 colorspace support
   - saa7164 converted to use the V4L2 core control framework
   - several new boards additions, cleanups and fixups

  PS: There are two patches for scripts/kernel-doc that are needed by
  the documentation patches on Media.  Jon is OK on merging those via
  my tree"

* tag 'media/v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (146 commits)
  [media] c8sectpfe: Remove select on CONFIG_FW_LOADER_USER_HELPER_FALLBACK
  [media] DocBook media: update copyright/version numbers
  [media] ivtv: Convert to get_user_pages_unlocked()
  [media] media/v4l2-ctrls: fix setting autocluster to manual with VIDIOC_S_CTRL
  [media] DocBook media: Fix a typo in encoder cmd
  [media] DocBook: add SDR specific info to G_MODULATOR / S_MODULATOR
  [media] DocBook: add SDR specific info to G_TUNER / S_TUNER
  [media] hackrf: do not set human readable name for formats
  [media] hackrf: add support for transmitter
  [media] hackrf: switch to single function which configures everything
  [media] hackrf: add control for RF amplifier
  [media] DocBook: add modulator type field
  [media] v4l: add type field to v4l2_modulator struct
  [media] DocBook: document SDR transmitter
  [media] v4l2: add support for SDR transmitter
  [media] DocBook: document tuner RF gain control
  [media] v4l2: add RF gain control
  [media] v4l2: rename V4L2_TUNER_ADC to V4L2_TUNER_SDR
  [media] media/vivid-osd: fix info leak in ioctl
  [media] media: videobuf2: Move v4l2-specific stuff to videobuf2-v4l2
  ...
parents 66339fda 79f5b6ae

Documentation/DocBook/device-drivers.tmpl

+76 −5
Original line number Diff line number Diff line
@@ -221,6 +221,9 @@ X!Isound/sound_firmware.c 
     <title>Media Devices</title>



     <sect1><title>Video2Linux devices</title>

!Iinclude/media/tuner.h

!Iinclude/media/tuner-types.h

!Iinclude/media/tveeprom.h

!Iinclude/media/v4l2-async.h

!Iinclude/media/v4l2-ctrls.h

!Iinclude/media/v4l2-dv-timings.h
@@ -231,6 +234,7 @@ X!Isound/sound_firmware.c 
!Iinclude/media/v4l2-of.h

!Iinclude/media/v4l2-subdev.h

!Iinclude/media/videobuf2-core.h

!Iinclude/media/videobuf2-v4l2.h

!Iinclude/media/videobuf2-memops.h

     </sect1>

     <sect1><title>Digital TV (DVB) devices</title>
@@ -239,9 +243,76 @@ X!Isound/sound_firmware.c 
!Idrivers/media/dvb-core/dvb_math.h

!Idrivers/media/dvb-core/dvb_ringbuffer.h

!Idrivers/media/dvb-core/dvbdev.h

	<sect1><title>Digital TV Demux API</title>

	    <para>The kernel demux API defines a driver-internal interface for

	    registering low-level, hardware specific driver to a hardware

	    independent demux layer. It is only of interest for Digital TV

	    device driver writers. The header file for this API is named

	    <constant>demux.h</constant> and located in

	    <constant>drivers/media/dvb-core</constant>.</para>



	<para>The demux API should be implemented for each demux in the

	system. It is used to select the TS source of a demux and to manage

	the demux resources. When the demux client allocates a resource via

	the demux API, it receives a pointer to the API of that

	resource.</para>

	<para>Each demux receives its TS input from a DVB front-end or from

	memory, as set via this demux API. In a system with more than one

	front-end, the API can be used to select one of the DVB front-ends

	as a TS source for a demux, unless this is fixed in the HW platform.

	The demux API only controls front-ends regarding to their connections

	with demuxes; the APIs used to set the other front-end parameters,

	such as tuning, are not defined in this document.</para>

	<para>The functions that implement the abstract interface demux should

	be defined static or module private and registered to the Demux

	core for external access. It is not necessary to implement every

	function in the struct <constant>dmx_demux</constant>. For example,

	a demux interface might support Section filtering, but not PES

	filtering. The API client is expected to check the value of any

	function pointer before calling the function: the value of NULL means

	that the &#8220;function is not available&#8221;.</para>

	<para>Whenever the functions of the demux API modify shared data,

	the possibilities of lost update and race condition problems should

	be addressed, e.g. by protecting parts of code with mutexes.</para>

	<para>Note that functions called from a bottom half context must not

	sleep. Even a simple memory allocation without using GFP_ATOMIC can

	result in a kernel thread being put to sleep if swapping is needed.

	For example, the Linux kernel calls the functions of a network device

	interface from a bottom half context. Thus, if a demux API function

	is called from network device code, the function must not sleep.

	</para>

    </sect1>



    <section id="demux_callback_api">

	<title>Demux Callback API</title>

	<para>This kernel-space API comprises the callback functions that

	deliver filtered data to the demux client. Unlike the other DVB

	kABIs, these functions are provided by the client and called from

	the demux code.</para>

	<para>The function pointers of this abstract interface are not

	packed into a structure as in the other demux APIs, because the

	callback functions are registered and used independent of each

	other. As an example, it is possible for the API client to provide

	several callback functions for receiving TS packets and no

	callbacks for PES packets or sections.</para>

	<para>The functions that implement the callback API need not be

	re-entrant: when a demux driver calls one of these functions,

	the driver is not allowed to call the function again before

	the original call returns. If a callback is triggered by a

	hardware interrupt, it is recommended to use the Linux

	&#8220;bottom half&#8221; mechanism or start a tasklet instead of

	making the callback function call directly from a hardware

	interrupt.</para>

	<para>This mechanism is implemented by

	<link linkend='API-dmx-ts-cb'>dmx_ts_cb()</link> and

	<link linkend='API-dmx-section-cb'>dmx_section_cb()</link>.</para>

    </section>



!Idrivers/media/dvb-core/demux.h

    </sect1>

    <sect1><title>Remote Controller devices</title>

!Iinclude/media/rc-core.h

!Iinclude/media/lirc_dev.h

    </sect1>

    <sect1><title>Media Controller devices</title>

!Iinclude/media/media-device.h

Documentation/DocBook/media/dvb/dvbapi.xml

+0 −3
Original line number Diff line number Diff line
@@ -125,9 +125,6 @@ Added ISDB-T test originally written by Patrick Boettcher 
	&sub-audio;

    </section>

  </chapter>

  <chapter id="dvb_kdapi">

    &sub-kdapi;

  </chapter>

  <chapter id="dvb_examples">

    &sub-examples;

  </chapter>

Documentation/DocBook/media/dvb/kdapi.xml

deleted100644 → 0
+0 −2309

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/DocBook/media/v4l/biblio.xml

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

    </biblioentry>



    <biblioentry id="smpte431">

      <abbrev>SMPTE&nbsp;RP&nbsp;431-2</abbrev>

      <authorgroup>

	<corpauthor>Society of Motion Picture and Television Engineers

(<ulink url="http://www.smpte.org">http://www.smpte.org</ulink>)</corpauthor>

      </authorgroup>

      <title>SMPTE RP 431-2:2011 "D-Cinema Quality - Reference Projector and Environment"</title>

    </biblioentry>



    <biblioentry id="smpte2084">

      <abbrev>SMPTE&nbsp;ST&nbsp;2084</abbrev>

      <authorgroup>

	<corpauthor>Society of Motion Picture and Television Engineers

(<ulink url="http://www.smpte.org">http://www.smpte.org</ulink>)</corpauthor>

      </authorgroup>

      <title>SMPTE ST 2084:2014 "High Dynamic Range Electro-Optical Transfer Function of Master Reference Displays"</title>

    </biblioentry>



    <biblioentry id="srgb">

      <abbrev>sRGB</abbrev>

      <authorgroup>

Documentation/DocBook/media/v4l/compat.xml

+20 −0
Original line number Diff line number Diff line
@@ -2591,6 +2591,26 @@ and &v4l2-mbus-framefmt;. 
      </orderedlist>

    </section>



    <section>

      <title>V4L2 in Linux 4.4</title>

      <orderedlist>

	<listitem>

	  <para>Renamed <constant>V4L2_TUNER_ADC</constant> to

<constant>V4L2_TUNER_SDR</constant>. The use of

<constant>V4L2_TUNER_ADC</constant> is deprecated now.

	  </para>

	</listitem>

	<listitem>

	  <para>Added <constant>V4L2_CID_RF_TUNER_RF_GAIN</constant>

RF Tuner control.</para>

	</listitem>

	<listitem>

	  <para>Added transmitter support for Software Defined Radio (SDR)

Interface.</para>

	</listitem>

      </orderedlist>

    </section>



    <section id="other">

      <title>Relation of V4L2 to other Linux multimedia APIs</title>

CRA Git | Maintained and supported by SUSTech CRA and CCSE