From: Hans Verkuil <hans.verkuil@xxxxxxxxx> It seems that Junghak no longer has time to work on this, so at Mauro's request I'm taking over this patch series. This is revision 10 and it incorporates comments from Sakari, Junghak and myself. Changes since v9: - Added my patches that drop the v4l2_format argument from queue_setup, incorporating Junghak's comments. - Updated Junghak's patches with my comments. - Added a solo6x10 timestamp handling fix. - Update the videobuf2-core module description. - Make the fill_user_buffer and copy_timestamp ops void. - Sakari reported that the handling of plane sizes was (and always has been) broken for create_bufs. This is now fixed in the last four patches (three cleanup/simplification patches and a final patch that fixes the problem). Regards, Hans Hans Verkuil (9): DocBook media: update VIDIOC_CREATE_BUFS documentation solo6x10: use v4l2_get_timestamp to fill in buffer timestamp videobuf2-core.c: update module description videobuf2-core: fill_user_buffer and copy_timestamp should return void videobuf2-core: move __setup_lengths into __vb2_queue_alloc() videobuf2-core: fill in q->bufs[vb->index] before buf_init() videobuf2-core: call __setup_offsets before buf_init() videobuf2-core: fix plane_sizes handling in VIDIOC_CREATE_BUFS test Junghak Sung (6): media: videobuf2: Move timestamp to vb2_buffer media: videobuf2: Add copy_timestamp to struct vb2_queue media: videobuf2: Separate vb2_poll() media: videobuf2: last_buffer_queued is set at fill_v4l2_buffer() media: videobuf2: Refactor vb2_fileio_data and vb2_thread media: videobuf2: Move vb2_fileio_data and vb2_thread to core part .../DocBook/media/v4l/vidioc-create-bufs.xml | 30 +- drivers/input/touchscreen/sur40.c | 2 +- drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +- drivers/media/pci/cobalt/cobalt-irq.c | 2 +- drivers/media/pci/cx23885/cx23885-core.c | 2 +- drivers/media/pci/cx23885/cx23885-video.c | 2 +- drivers/media/pci/cx25821/cx25821-video.c | 2 +- drivers/media/pci/cx88/cx88-core.c | 2 +- drivers/media/pci/dt3155/dt3155.c | 2 +- drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- drivers/media/pci/saa7134/saa7134-core.c | 2 +- drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 3 +- drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +- drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +- drivers/media/pci/tw68/tw68-video.c | 2 +- drivers/media/platform/am437x/am437x-vpfe.c | 2 +- drivers/media/platform/blackfin/bfin_capture.c | 2 +- drivers/media/platform/coda/coda-bit.c | 6 +- drivers/media/platform/coda/coda.h | 2 +- drivers/media/platform/davinci/vpbe_display.c | 2 +- drivers/media/platform/davinci/vpif_capture.c | 2 +- drivers/media/platform/davinci/vpif_display.c | 6 +- drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +- drivers/media/platform/exynos4-is/fimc-capture.c | 2 +- drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- drivers/media/platform/exynos4-is/fimc-m2m.c | 2 +- drivers/media/platform/m2m-deinterlace.c | 2 +- drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- drivers/media/platform/mx2_emmaprp.c | 2 +- drivers/media/platform/omap3isp/ispvideo.c | 2 +- drivers/media/platform/rcar_jpu.c | 2 +- drivers/media/platform/s3c-camif/camif-capture.c | 2 +- drivers/media/platform/s5p-g2d/g2d.c | 2 +- drivers/media/platform/s5p-jpeg/jpeg-core.c | 4 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 +- drivers/media/platform/sh_veu.c | 2 +- drivers/media/platform/sh_vou.c | 2 +- drivers/media/platform/soc_camera/atmel-isi.c | 2 +- drivers/media/platform/soc_camera/mx2_camera.c | 2 +- drivers/media/platform/soc_camera/mx3_camera.c | 2 +- drivers/media/platform/soc_camera/rcar_vin.c | 2 +- .../platform/soc_camera/sh_mobile_ceu_camera.c | 2 +- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 4 +- drivers/media/platform/ti-vpe/vpe.c | 2 +- drivers/media/platform/vim2m.c | 2 +- drivers/media/platform/vivid/vivid-core.h | 2 +- drivers/media/platform/vivid/vivid-ctrls.c | 14 +- drivers/media/platform/vivid/vivid-kthread-cap.c | 6 +- drivers/media/platform/vivid/vivid-kthread-out.c | 8 +- drivers/media/platform/vivid/vivid-sdr-cap.c | 4 +- drivers/media/platform/vivid/vivid-vbi-cap.c | 6 +- drivers/media/platform/vsp1/vsp1_video.c | 2 +- drivers/media/platform/xilinx/xilinx-dma.c | 2 +- drivers/media/usb/airspy/airspy.c | 2 +- drivers/media/usb/au0828/au0828-video.c | 2 +- drivers/media/usb/em28xx/em28xx-video.c | 2 +- drivers/media/usb/go7007/go7007-driver.c | 2 +- drivers/media/usb/hackrf/hackrf.c | 4 +- drivers/media/usb/pwc/pwc-if.c | 3 +- drivers/media/usb/s2255/s2255drv.c | 2 +- drivers/media/usb/stk1160/stk1160-video.c | 2 +- drivers/media/usb/usbtv/usbtv-video.c | 2 +- drivers/media/usb/uvc/uvc_video.c | 15 +- drivers/media/v4l2-core/videobuf2-core.c | 903 +++++++++++++++++++-- drivers/media/v4l2-core/videobuf2-internal.h | 161 ---- drivers/media/v4l2-core/videobuf2-v4l2.c | 653 +-------------- drivers/staging/media/davinci_vpfe/vpfe_video.c | 2 +- drivers/staging/media/omap4iss/iss_video.c | 2 +- drivers/usb/gadget/function/uvc_queue.c | 2 +- include/media/videobuf2-core.h | 68 +- include/media/videobuf2-v4l2.h | 40 +- include/trace/events/v4l2.h | 4 +- include/trace/events/vb2.h | 7 +- 74 files changed, 1029 insertions(+), 1030 deletions(-) delete mode 100644 drivers/media/v4l2-core/videobuf2-internal.h -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html