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

Commit 47c62e4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:
 "The part of patches for Kernel 4.5.  There's nothing really big here:

   - driver-specific headers for media devices were moved to separate
     directories, in order to make clear what headers belong to the core
     kABI and require documentation

   - Platform data for media drivers were moved from include/media to
     include/linux/platform_data/media

   - add a driver for cs3308 8-channel volume control, used on some
     high-end capture boards

   - lirc.h kAPI header were added at include/uapi/linux

   - Driver cleanups, new board additions and improvements"

* tag 'media/v4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (204 commits)
  [media] rc: sunxi-cir: Initialize the spinlock properly
  [media] rtl2832: do not filter out slave TS null packets
  [media] rtl2832: print reg number on error case
  [media] rtl28xxu: return demod reg page from driver cache
  [media] coda: enable MPEG-2 ES decoding
  [media] coda: don't start streaming without queued buffers
  [media] coda: hook up vidioc_prepare_buf
  [media] coda: relax coda_jpeg_check_buffer for trailing bytes
  [media] coda: make to_coda_video_device static
  [media] s5p-mfc: remove volatile attribute from MFC register addresses
  [media] s5p-mfc: merge together s5p_mfc_hw_call and s5p_mfc_hw_call_void
  [media] s5p-mfc: use spinlock to protect MFC context
  [media] s5p-mfc: remove unnecessary callbacks
  [media] s5p-mfc: make queue cleanup code common
  [media] s5p-mfc: use one implementation of s5p_mfc_get_new_ctx
  [media] s5p-mfc: constify s5p_mfc_codec_ops structures
  [media] au8522: Avoid memory leak for device config data
  [media] ir-lirc-codec.c: don't leak lirc->drv-rbuf
  [media] uvcvideo: small cleanup in uvc_video_clock_update()
  [media] uvcvideo: Fix reading the current exposure value of UVC
  ...
parents 2c487121 c3152592

Documentation/DocBook/device-drivers.tmpl

+16 −68
Original line number Diff line number Diff line
@@ -238,78 +238,26 @@ X!Isound/sound_firmware.c 
!Iinclude/media/videobuf2-memops.h

     </sect1>

     <sect1><title>Digital TV (DVB) devices</title>

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

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

	<sect1><title>Digital TV Common functions</title>

!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>



	<sect1><title>Digital TV Frontend kABI</title>

!Pdrivers/media/dvb-core/dvb_frontend.h Digital TV Frontend

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

	</sect1>

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

!Pdrivers/media/dvb-core/demux.h Digital TV Demux

	<sect1><title>Demux Callback API</title>

!Pdrivers/media/dvb-core/demux.h Demux Callback

	</sect1>

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

	</sect1>

	<sect1><title>Digital TV Conditional Access kABI</title>

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

	</sect1>

     </sect1>

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

!Iinclude/media/rc-core.h

!Iinclude/media/lirc_dev.h

Documentation/DocBook/media/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -199,8 +199,10 @@ DVB_DOCUMENTED = \ 
#



install_media_images = \

	$(Q)-mkdir $(MEDIA_OBJ_DIR)/media_api; \

	cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/*.svg $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api

	$(Q)if [ "x$(findstring media_api.xml,$(DOCBOOKS))" != "x" ]; then \

		mkdir -p $(MEDIA_OBJ_DIR)/media_api; \

		cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/*.svg $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api; \

	fi



$(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

	$(Q)base64 -d $< >$@

Documentation/DocBook/media/dvb/dvbproperty.xml

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int main(void) 


<para>NOTE: While it is possible to directly call the Kernel code like the

    above example, it is strongly recommended to use

    <ulink url="http://linuxtv.org/docs/libdvbv5/index.html">libdvbv5</ulink>,

    <ulink url="https://linuxtv.org/docs/libdvbv5/index.html">libdvbv5</ulink>,

    as it provides abstraction to work with the supported digital TV standards

    and provides methods for usual operations like program scanning and to

    read/write channel descriptor files.</para>

Documentation/DocBook/media/dvb/examples.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
</para>

<para>NOTE: This section is out of date, and the code below won't even

    compile. Please refer to the

    <ulink url="http://linuxtv.org/docs/libdvbv5/index.html">libdvbv5</ulink>

    <ulink url="https://linuxtv.org/docs/libdvbv5/index.html">libdvbv5</ulink>

    for updated/recommended examples.

</para>

Documentation/DocBook/media/dvb/intro.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ and filtering several section and PES data streams at the same time. 
new standard Linux DVB API. As a commitment to the development of

terminals based on open standards, Nokia and Convergence made it

available to all Linux developers and published it on

<ulink url="http://www.linuxtv.org/" /> in September 2000.

<ulink url="https://linuxtv.org" /> in September 2000.

Convergence is the maintainer of the Linux DVB API. Together with the

LinuxTV community (i.e. you, the reader of this document), the Linux DVB

API will be constantly reviewed and improved. With the Linux driver for