Commit 7cf901b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media fixes from Mauro Carvalho Chehab:

  - some build fixes with randconfigs

  - an m88ds3103 fix to prevent an OOPS if the chip doesn't provide the
    right version during probe (with can happen if the hardware hangs)

  - a potential out of array bounds reference in tvp5150

  - some fixes and improvements in the DVB memory mapped API (added for
    kernel 4.16)

* tag 'media/v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: vb2: Makefile: place vb2-trace together with vb2-core
  media: Don't let tvp5150_get_vbi() go out of vbi_ram_default array
  media: dvb: update buffer mmaped flags and frame counter
  media: dvb: add continuity error indicators for memory mapped buffers
  media: dmxdev: Fix the logic that enables DMA mmap support
  media: dmxdev: fix error code for invalid ioctls
  media: m88ds3103: don't call a non-initalized function
  media: au0828: add VIDEO_V4L2 dependency
  media: dvb: fix DVB_MMAP dependency
  media: dvb: fix DVB_MMAP symbol name
  media: videobuf2: fix build issues with vb2-trace
  media: videobuf2: Add VIDEOBUF2_V4L2 Kconfig option for VB2 V4L2 part
parents d6d0972a 7dbdd16a

Documentation/media/dmx.h.rst.exceptions

+10 −4
Original line number Diff line number Diff line
@@ -50,9 +50,15 @@ replace typedef dmx_filter_t :c:type:`dmx_filter` 
replace typedef dmx_pes_type_t :c:type:`dmx_pes_type`

replace typedef dmx_input_t :c:type:`dmx_input`



ignore symbol DMX_OUT_DECODER

ignore symbol DMX_OUT_TAP

ignore symbol DMX_OUT_TS_TAP

ignore symbol DMX_OUT_TSDEMUX_TAP

replace symbol DMX_BUFFER_FLAG_HAD_CRC32_DISCARD :c:type:`dmx_buffer_flags`

replace	symbol DMX_BUFFER_FLAG_TEI :c:type:`dmx_buffer_flags`

replace	symbol DMX_BUFFER_PKT_COUNTER_MISMATCH :c:type:`dmx_buffer_flags`

replace	symbol DMX_BUFFER_FLAG_DISCONTINUITY_DETECTED :c:type:`dmx_buffer_flags`

replace	symbol DMX_BUFFER_FLAG_DISCONTINUITY_INDICATOR :c:type:`dmx_buffer_flags`



replace symbol DMX_OUT_DECODER :c:type:`dmx_output`

replace symbol DMX_OUT_TAP :c:type:`dmx_output`

replace symbol DMX_OUT_TS_TAP :c:type:`dmx_output`

replace symbol DMX_OUT_TSDEMUX_TAP :c:type:`dmx_output`



replace ioctl DMX_DQBUF dmx_qbuf

Documentation/media/uapi/dvb/dmx-qbuf.rst

+4 −3
Original line number Diff line number Diff line
@@ -51,9 +51,10 @@ out to disk. Buffers remain locked until dequeued, until the 
the device is closed.



Applications call the ``DMX_DQBUF`` ioctl to dequeue a filled

(capturing) buffer from the driver's outgoing queue. They just set the ``reserved`` field array to zero. When ``DMX_DQBUF`` is called with a

pointer to this structure, the driver fills the remaining fields or

returns an error code.

(capturing) buffer from the driver's outgoing queue.

They just set the ``index`` field withe the buffer ID to be queued.

When ``DMX_DQBUF`` is called with a pointer to struct :c:type:`dmx_buffer`,

the driver fills the remaining fields or returns an error code.



By default ``DMX_DQBUF`` blocks when no buffer is in the outgoing

queue. When the ``O_NONBLOCK`` flag was given to the

drivers/media/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ config DVB_CORE 
config DVB_MMAP

	bool "Enable DVB memory-mapped API (EXPERIMENTAL)"

	depends on DVB_CORE

	depends on VIDEO_V4L2=y || VIDEO_V4L2=DVB_CORE

	select VIDEOBUF2_VMALLOC

	default n

	help

	  This option enables DVB experimental memory-mapped API, with

drivers/media/common/videobuf2/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ config VIDEOBUF2_CORE 
	select DMA_SHARED_BUFFER

	tristate



config VIDEOBUF2_V4L2

	tristate



config VIDEOBUF2_MEMOPS

	tristate

	select FRAME_VECTOR

drivers/media/common/videobuf2/Makefile

+8 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

videobuf2-common-objs := videobuf2-core.o



obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o videobuf2-v4l2.o

ifeq ($(CONFIG_TRACEPOINTS),y)

  videobuf2-common-objs += vb2-trace.o

endif



obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-common.o

obj-$(CONFIG_VIDEOBUF2_V4L2) += videobuf2-v4l2.o

obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o

obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o

obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE