Hello, This is the second version of the patch set that ports the OMAP3 ISP driver to the videobuf2 framework. I've tried to keep patches small and reviewable (24/25 is a bit too big for my taste, but splitting it further would be pretty difficult), so please look at them for details. The patches are based on top of the latest OMAP IOMMU patches queued for v3.16, themselves based directly on top of v3.15-rc1. The result is currently broken due to changes to the ARM DMA mapping implementation in v3.15-rc1. A patch (http://www.spinics.net/lists/arm-kernel/msg324012.html) has been posted and should go in v3.15. Please apply the patch in the meantime if you want to test the driver. I plan to send a pull request for v3.16 around the end of the week. Changes since v1: - Rebased on top of v3.15-rc1 - Added patch 23/26 Laurent Pinchart (26): omap3isp: stat: Rename IS_COHERENT_BUF to ISP_STAT_USES_DMAENGINE omap3isp: stat: Remove impossible WARN_ON omap3isp: stat: Share common code for buffer allocation omap3isp: stat: Merge dma_addr and iommu_addr fields omap3isp: stat: Store sg table in ispstat_buffer omap3isp: stat: Use the DMA API omap3isp: ccdc: Use the DMA API for LSC omap3isp: ccdc: Use the DMA API for FPC omap3isp: video: Set the buffer bytesused field at completion time omap3isp: queue: Move IOMMU handling code to the queue omap3isp: queue: Use sg_table structure omap3isp: queue: Merge the prepare and sglist functions omap3isp: queue: Inline the ispmmu_v(un)map functions omap3isp: queue: Allocate kernel buffers with dma_alloc_coherent omap3isp: queue: Fix the dma_map_sg() return value check omap3isp: queue: Map PFNMAP buffers to device omap3isp: queue: Use sg_alloc_table_from_pages() omap3isp: Use the ARM DMA IOMMU-aware operations omap3isp: queue: Don't build scatterlist for kernel buffer omap3isp: Move queue mutex to isp_video structure omap3isp: Move queue irqlock to isp_video structure omap3isp: Move buffer irqlist to isp_buffer structure omap3isp: Cancel all queued buffers when stopping the video stream v4l: vb2: Add a function to discard all DONE buffers omap3isp: Move to videobuf2 omap3isp: Rename isp_buffer isp_addr field to dma drivers/media/platform/Kconfig | 4 +- drivers/media/platform/omap3isp/Makefile | 2 +- drivers/media/platform/omap3isp/isp.c | 108 ++- drivers/media/platform/omap3isp/isp.h | 8 +- drivers/media/platform/omap3isp/ispccdc.c | 107 ++- drivers/media/platform/omap3isp/ispccdc.h | 16 +- drivers/media/platform/omap3isp/ispccp2.c | 4 +- drivers/media/platform/omap3isp/ispcsi2.c | 4 +- drivers/media/platform/omap3isp/isph3a_aewb.c | 2 +- drivers/media/platform/omap3isp/isph3a_af.c | 2 +- drivers/media/platform/omap3isp/isppreview.c | 8 +- drivers/media/platform/omap3isp/ispqueue.c | 1161 ------------------------- drivers/media/platform/omap3isp/ispqueue.h | 188 ---- drivers/media/platform/omap3isp/ispresizer.c | 8 +- drivers/media/platform/omap3isp/ispstat.c | 197 ++--- drivers/media/platform/omap3isp/ispstat.h | 3 +- drivers/media/platform/omap3isp/ispvideo.c | 325 +++---- drivers/media/platform/omap3isp/ispvideo.h | 29 +- drivers/media/v4l2-core/videobuf2-core.c | 24 + drivers/staging/media/omap4iss/iss_video.c | 2 +- include/media/videobuf2-core.h | 1 + 21 files changed, 458 insertions(+), 1745 deletions(-) delete mode 100644 drivers/media/platform/omap3isp/ispqueue.c delete mode 100644 drivers/media/platform/omap3isp/ispqueue.h -- Regards, Laurent Pinchart -- 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
