p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/Documentation/DocBook/media/v4l
History
Mauro Carvalho Chehab 64131a87f2 Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus 
* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
  media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
  hexdump: avoid warning in test function
  fs: take i_mutex during prepare_binprm for set[ug]id executables
  smp: Fix error case handling in smp_call_function_*()
  iommu-common: Fix PARISC compile-time warnings
  sparc: Make LDC use common iommu poll management functions
  sparc: Make sparc64 use scalable lib/iommu-common.c functions
  Break up monolithic iommu table/lock into finer graularity pools and lock
  sparc: Revert generic IOMMU allocator.
  tools/power turbostat: correct dumped pkg-cstate-limit value
  tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
  tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
  tools/power turbostat: Initial Skylake support
  tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
  tools/power turbostat: modprobe msr, if needed
  tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
  tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
  Bluetooth: hidp: Fix regression with older userspace and flags validation
  config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
  perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
  ...

That solves several merge conflicts:
	Documentation/DocBook/media/v4l/subdev-formats.xml
	Documentation/devicetree/bindings/vendor-prefixes.txt
	drivers/staging/media/mn88473/mn88473.c
	include/linux/kconfig.h
	include/uapi/linux/media-bus-format.h

The ones at subdev-formats.xml and media-bus-format.h are not trivial.
That's why we opted to merge from DRM.
 		2015-04-21 09:44:55 -03:00
..
.gitignore
…
biblio.xml [media] DocBook media: fix broken EIA hyperlink 2015-04-02 22:12:21 -03:00
capture.c.xml
…
common.xml Documentation: fix broken v4l-utils URL 2014-10-03 15:49:57 +02:00
compat.xml [media] DocBook media: improve event documentation 2015-04-02 22:04:07 -03:00
controls.xml [media] media-doc: Fix MFC display delay control doc 2015-02-02 09:58:10 -02:00
crop.pdf
…
dev-capture.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
dev-codec.xml [media] DocBook: media: update codec section, drop obsolete 'suspended' state 2013-05-21 07:59:11 -03:00
dev-effect.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
dev-event.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
dev-osd.xml [media] DocBook: fix incorrect code example 2014-03-13 11:11:50 -03:00
dev-output.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
dev-overlay.xml [media] videodev2: Set vb2_rect's width and height as unsigned 2014-01-07 08:02:39 -02:00
dev-radio.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
dev-raw-vbi.xml [media] DocBook media: document new VBI defines 2014-07-22 00:41:23 -03:00
dev-rds.xml [media] DocBook: update RDS references to the latest RDS standards 2012-08-15 18:56:19 -03:00
dev-sdr.xml [media] DocBook media: v4l2_sdr_format buffersize field 2014-07-21 21:39:45 -03:00
dev-sliced-vbi.xml [media] DocBook media: fix broken EIA hyperlink 2015-04-02 22:12:21 -03:00
dev-subdev.xml [media] v4l: Clean up sub-device format documentation 2014-12-04 12:36:05 -02:00
dev-teletext.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
driver.xml Documentation: remove __dev* attributes. 2013-01-03 15:57:16 -08:00
fdl-appendix.xml
…
fieldseq_bt.pdf
…
fieldseq_tb.pdf
…
func-close.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
func-ioctl.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
func-mmap.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
func-munmap.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
func-open.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
func-poll.xml [media] DocBook media: improve the poll() documentation 2014-09-21 20:58:36 -03:00
func-read.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
func-select.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
func-write.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
gen-errors.xml [media] DocBook: EAGAIN == EWOULDBLOCK 2012-09-26 17:48:39 -03:00
io.xml [media] DocBook media: Clarify V4L2_FIELD_ANY for drivers 2014-11-03 14:47:47 -02:00
keytable.c.xml
…
libv4l.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
lirc_device_interface.xml [media] lirc: make transmit interface consistent 2013-07-30 17:04:23 -03:00
media-controller.xml
…
media-func-close.xml
…
media-func-ioctl.xml [media] DocBook: Remove V4L generic error description for ioctl() 2011-07-27 17:53:36 -03:00
media-func-open.xml
…
media-ioc-device-info.xml [media] DocBook: Use the generic error code page also for MC API 2011-07-27 17:53:35 -03:00
media-ioc-enum-entities.xml [media] media.h: mark alsa struct in media_entity_desc as TODO 2015-02-26 08:40:10 -03:00
media-ioc-enum-links.xml [media] Documentation: media: Remove double 'struct' 2014-05-23 19:47:05 -03:00
media-ioc-setup-link.xml [media] DocBook/media-ioc-setup-link.xml: Remove EBUSY 2011-07-27 17:53:35 -03:00
pipeline.pdf
…
pixfmt-grey.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-m420.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-nv12.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-nv12m.xml [media] DocBook: fix an index reference 2012-12-19 13:00:27 -02:00
pixfmt-nv12mt.xml Documentation/DocBook/media/v4l fix a typo 2013-06-05 16:24:59 +02:00
pixfmt-nv16.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-nv16m.xml [media] media DocBook: fix NV16M description 2014-03-11 09:26:37 -03:00
pixfmt-nv24.xml v4l: Add V4L2_PIX_FMT_NV24 and V4L2_PIX_FMT_NV42 formats 2011-12-19 20:07:13 +00:00
pixfmt-packed-rgb.xml [media] DocBook media: clarify BGR666 2015-04-02 21:05:15 -03:00
pixfmt-packed-yuv.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-sbggr8.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-sbggr16.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-sdr-cs08.xml [media] DocBook: V4L: add V4L2_SDR_FMT_CS8 - 'CS08' 2014-07-21 20:23:04 -03:00
pixfmt-sdr-cs14le.xml [media] DocBook: V4L: add V4L2_SDR_FMT_CS14LE - 'CS14' 2014-07-21 20:28:02 -03:00
pixfmt-sdr-cu08.xml [media] DocBook: V4L: add V4L2_SDR_FMT_CU8 - 'CU08' 2014-03-13 10:26:45 -03:00
pixfmt-sdr-cu16le.xml [media] DocBook: V4L: add V4L2_SDR_FMT_CU16LE - 'CU16' 2014-03-13 10:26:46 -03:00
pixfmt-sdr-ru12le.xml [media] DocBook: V4L: add V4L2_SDR_FMT_RU12LE - 'RU12' 2014-07-21 20:13:16 -03:00
pixfmt-sgbrg8.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-sgrbg8.xml [media] DocBook media: fix PIX_FMT_SGRBR8 example 2015-04-02 18:24:34 -03:00
pixfmt-srggb8.xml
…
pixfmt-srggb10.xml [media] DocBook: v4l: Fix raw bayer pixel format documentation wording 2014-12-23 10:54:11 -02:00
pixfmt-srggb10alaw8.xml [media] DocBook: v4l: Fix raw bayer pixel format documentation wording 2014-12-23 10:54:11 -02:00
pixfmt-srggb10dpcm8.xml [media] DocBook: v4l: Fix raw bayer pixel format documentation wording 2014-12-23 10:54:11 -02:00
pixfmt-srggb10p.xml [media] DocBook media: fix validation error 2015-03-02 14:46:16 -03:00
pixfmt-srggb12.xml [media] DocBook: v4l: Fix raw bayer pixel format documentation wording 2014-12-23 10:54:11 -02:00
pixfmt-uv8.xml [media] v4l2: add new pixel formats supported on dm365 2012-12-19 13:02:10 -02:00
pixfmt-uyvy.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-vyuy.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-y10.xml
…
pixfmt-y10b.xml
…
pixfmt-y12.xml
…
pixfmt-y16.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-y41p.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-yuv410.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-yuv411p.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-yuv420.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-yuv420m.xml [media] DocBook media: fix typos in YUV420M description 2015-03-03 11:22:22 -03:00
pixfmt-yuv422p.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-yuyv.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt-yvu420m.xml [media] v4l: Add new YVU420 multi planar fourcc definition 2012-09-15 10:50:46 -03:00
pixfmt-yvyu.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
pixfmt.xml [media] v4l2_plane_pix_format: use __u32 bytesperline instead of __u16 2015-04-02 23:54:47 -03:00
planar-apis.xml
…
remote_controllers.xml [media] rc: add wakeup_protocols sysfs file 2014-03-11 13:28:20 -03:00
selection-api.xml [media] DocBook media: fix wrong spacing 2014-07-17 16:26:55 -03:00
selections-common.xml [media] v4l: Add V4L2_SEL_TGT_NATIVE_SIZE selection target 2014-12-04 12:37:01 -02:00
subdev-formats.xml Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus 2015-04-21 09:44:55 -03:00
subdev-image-processing-crop.dia [media] v4l: Add subdev selections documentation: svg and dia files 2012-04-10 17:11:21 -03:00
subdev-image-processing-crop.svg [media] v4l: Add subdev selections documentation: svg and dia files 2012-04-10 17:11:21 -03:00
subdev-image-processing-full.dia [media] v4l: Add subdev selections documentation: svg and dia files 2012-04-10 17:11:21 -03:00
subdev-image-processing-full.svg [media] v4l: Add subdev selections documentation: svg and dia files 2012-04-10 17:11:21 -03:00
subdev-image-processing-scaling-multi-source.dia [media] v4l: Add subdev selections documentation: svg and dia files 2012-04-10 17:11:21 -03:00
subdev-image-processing-scaling-multi-source.svg [media] v4l: Add subdev selections documentation: svg and dia files 2012-04-10 17:11:21 -03:00
v4l2.xml [media] DocBook: Add tuner subdev at documentation 2015-02-13 21:10:12 -02:00
v4l2grab.c.xml
…
vbi_525.pdf
…
vbi_625.pdf
…
vbi_hsync.pdf
…
vidioc-create-bufs.xml [media] Documentation: media: Clarify the VIDIOC_CREATE_BUFS format requirements 2013-08-18 07:18:43 -03:00
vidioc-cropcap.xml [media] DocBook media: fix VIDIOC_CROPCAP type description 2015-04-02 21:13:21 -03:00
vidioc-dbg-g-chip-info.xml [media] DocBook: remove references to the dropped VIDIOC_DBG_G_CHIP_IDENT ioctl 2013-06-21 10:47:22 -03:00
vidioc-dbg-g-register.xml [media] DocBook: remove obsolete note from the dbg_g_register doc 2013-06-21 10:47:49 -03:00
vidioc-decoder-cmd.xml [media] v4l: Remove experimental tag from certain API elements 2012-09-26 09:22:48 -03:00
vidioc-dqevent.xml [media] media/Documentation: New flag EXECUTE_ON_WRITE 2015-04-08 06:35:16 -03:00
vidioc-dv-timings-cap.xml [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
vidioc-encoder-cmd.xml [media] v4l: Remove experimental tag from certain API elements 2012-09-26 09:22:48 -03:00
vidioc-enum-dv-timings.xml [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
vidioc-enum-fmt.xml [media] DocBook: deprecate V4L2_BUF_TYPE_PRIVATE 2012-09-26 09:44:12 -03:00
vidioc-enum-frameintervals.xml [media] DocBook: Use the generic ioctl error codes for all V4L ioctl's 2011-07-27 17:53:35 -03:00
vidioc-enum-framesizes.xml [media] v4l: Remove experimental tag from certain API elements 2012-09-26 09:22:48 -03:00
vidioc-enum-freq-bands.xml [media] DocBook: document 1 Hz flag 2014-03-05 14:16:12 -03:00
vidioc-enumaudio.xml [media] DocBook: Use the generic ioctl error codes for all V4L ioctl's 2011-07-27 17:53:35 -03:00
vidioc-enumaudioout.xml [media] DocBook: Use the generic ioctl error codes for all V4L ioctl's 2011-07-27 17:53:35 -03:00
vidioc-enuminput.xml [media] v4l: Add input and output capability flags for native size setting 2014-12-04 12:38:09 -02:00
vidioc-enumoutput.xml [media] v4l: Add input and output capability flags for native size setting 2014-12-04 12:38:09 -02:00
vidioc-enumstd.xml [media] DocBook: document when to return ENODATA 2012-09-26 09:46:39 -03:00
vidioc-expbuf.xml [media] videobuf2: Add support for file access mode flags for DMABUF exporting 2013-11-29 14:12:43 -02:00
vidioc-g-audio.xml [media] DocBook: Use the generic ioctl error codes for all V4L ioctl's 2011-07-27 17:53:35 -03:00
vidioc-g-audioout.xml [media] DocBook: Use the generic ioctl error codes for all V4L ioctl's 2011-07-27 17:53:35 -03:00
vidioc-g-crop.xml [media] DocBook media: fix VIDIOC_CROPCAP type description 2015-04-02 21:13:21 -03:00
vidioc-g-ctrl.xml [media] DocBook: mention that EINVAL can be returned for invalid menu indices 2013-02-06 08:12:57 -02:00
vidioc-g-dv-timings.xml [media] DocBook media: document the new V4L2_DV_FL_IS_CE_VIDEO flag 2015-04-08 06:37:54 -03:00
vidioc-g-edid.xml [media] DocBook media: fix wrong prototype 2014-09-21 20:39:18 -03:00
vidioc-g-enc-index.xml [media] v4l: Remove experimental tag from certain API elements 2012-09-26 09:22:48 -03:00
vidioc-g-ext-ctrls.xml [media] DocBook media: document new u8 and u16 control types 2014-07-17 11:57:25 -03:00
vidioc-g-fbuf.xml [media] DocBook v4l: update bytesperline handling 2015-04-02 18:20:19 -03:00
vidioc-g-fmt.xml [media] DocBook media: v4l2_format_sdr was renamed to v4l2_sdr_format 2014-03-14 09:54:05 -03:00
vidioc-g-frequency.xml [media] DocBook: document 1 Hz flag 2014-03-05 14:16:12 -03:00
vidioc-g-input.xml [media] V4L2 Spec: improve the G/S_INPUT/OUTPUT documentation 2012-01-16 09:38:29 -02:00
vidioc-g-jpegcomp.xml [media] DocBook: Fix typo in V4L2_CID_JPEG_COMPRESSION_QUALITY reference 2013-07-30 15:55:24 -03:00
vidioc-g-modulator.xml [media] DocBook: document 1 Hz flag 2014-03-05 14:16:12 -03:00
vidioc-g-output.xml [media] V4L2 Spec: improve the G/S_INPUT/OUTPUT documentation 2012-01-16 09:38:29 -02:00
vidioc-g-parm.xml doc: Fix typo "is is" in Documentations 2013-08-27 10:50:52 +02:00
vidioc-g-priority.xml [media] Remove unneeded comments from the media API DocBook files 2011-12-11 09:16:53 -02:00
vidioc-g-selection.xml [media] DocBook media: fix VIDIOC_CROPCAP type description 2015-04-02 21:13:21 -03:00
vidioc-g-sliced-vbi-cap.xml [media] DocBook media: fix broken EIA hyperlink 2015-04-02 22:12:21 -03:00
vidioc-g-std.xml [media] DocBook: document when to return ENODATA 2012-09-26 09:46:39 -03:00
vidioc-g-tuner.xml [media] DocBook: document 1 Hz flag 2014-03-05 14:16:12 -03:00
vidioc-log-status.xml [media] DocBook: Use the generic ioctl error codes for all V4L ioctl's 2011-07-27 17:53:35 -03:00
vidioc-overlay.xml [media] DocBook: Use the generic ioctl error codes for all V4L ioctl's 2011-07-27 17:53:35 -03:00
vidioc-prepare-buf.xml [media] V4L2 spec: document the new V4L2 DV timings ioctls 2012-05-20 08:18:03 -03:00
vidioc-qbuf.xml [media] Documentation: media: description of DMABUF importing in V4L2 2012-11-25 17:11:04 -02:00
vidioc-query-dv-timings.xml [media] DocBook: document when to return ENODATA 2012-09-26 09:46:39 -03:00
vidioc-querybuf.xml [media] DocBook: various updates w.r.t. v4l2_buffer and multiplanar 2012-10-05 22:25:17 -03:00
vidioc-querycap.xml [media] DocBook media: fix awkward language in VIDIOC_QUERYCAP 2015-04-02 21:13:56 -03:00
vidioc-queryctrl.xml [media] media/Documentation: New flag EXECUTE_ON_WRITE 2015-04-08 06:35:16 -03:00
vidioc-querystd.xml [media] DocBook/media/v4l: clarify the QUERYSTD documentation 2013-06-17 09:45:56 -03:00
vidioc-reqbufs.xml [media] Documentation: media: description of DMABUF importing in V4L2 2012-11-25 17:11:04 -02:00
vidioc-s-hw-freq-seek.xml [media] DocBook: document 1 Hz flag 2014-03-05 14:16:12 -03:00
vidioc-streamon.xml [media] DocBook media: update STREAMON/OFF documentation 2014-03-13 11:11:29 -03:00
vidioc-subdev-enum-frame-interval.xml [media] DocBook media: document the new 'which' field 2015-03-23 11:50:28 -07:00
vidioc-subdev-enum-frame-size.xml [media] DocBook media: document the new 'which' field 2015-03-23 11:50:28 -07:00
vidioc-subdev-enum-mbus-code.xml [media] DocBook media: document the new 'which' field 2015-03-23 11:50:28 -07:00
vidioc-subdev-g-crop.xml [media] v4l: Mark VIDIOC_SUBDEV_G_CROP and VIDIOC_SUBDEV_S_CROP obsolete 2012-04-10 17:12:13 -03:00
vidioc-subdev-g-fmt.xml [media] DocBook: Use the generic ioctl error codes for all V4L ioctl's 2011-07-27 17:53:35 -03:00
vidioc-subdev-g-frame-interval.xml
…
vidioc-subdev-g-selection.xml [media] DocBook media: fix fieldname in struct v4l2_subdev_selection 2014-09-21 20:46:32 -03:00
vidioc-subscribe-event.xml [media] DocBook media: improve event documentation 2015-04-02 22:04:07 -03:00