Hi Dave,

Could you pull in Steve Longerbeam's preparation series for capture support? The first two patches change the ipu_cpmem API. They need to be kept together and touch the staging driver, so I have prepared a tag containing just the two of them for Greg to pull.

The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:

Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)

are available in the git repository at:

git://git.pengutronix.de/git/pza/linux.git tags/ipu-3.18

for you to fetch changes up to 3feb049f378da6aa1209e05ef5c656a1f26a9183:

gpu: ipu-v3: Add ipu_dump() (2014-09-02 14:55:56 +0200)

---------------------------------------------------------------- IPUv3 preparations for capture support

---------------------------------------------------------------- Steve Longerbeam (26): gpu: ipu-v3: Add ipu-cpmem unit staging: imx-drm: Convert to new ipu_cpmem API gpu: ipu-v3: Add functions to set CSI/IC source muxes gpu: ipu-v3: Rename and add IDMAC channels gpu: ipu-v3: Add Camera Sensor Interface unit gpu: ipu-v3: Add Image Converter unit gpu: ipu-v3: smfc: Move enable/disable to ipu-smfc.c gpu: ipu-v3: smfc: Convert to per-channel gpu: ipu-v3: smfc: Add ipu_smfc_set_watermark() gpu: ipu-v3: Add ipu_mbus_code_to_colorspace() gpu: ipu-v3: Add rotation mode conversion utilities gpu: ipu-v3: Add helper function checking if pixfmt is planar gpu: ipu-v3: Move IDMAC channel names to imx-ipu-v3.h gpu: ipu-v3: Add ipu_idmac_buffer_is_ready() gpu: ipu-v3: Add ipu_idmac_clear_buffer() gpu: ipu-v3: Add __ipu_idmac_reset_current_buffer() gpu: ipu-v3: Add ipu_stride_to_bytes() gpu: ipu-v3: Add ipu_idmac_enable_watermark() gpu: ipu-v3: Add ipu_idmac_lock_enable() gpu: ipu-cpmem: Add ipu_cpmem_set_block_mode() gpu: ipu-cpmem: Add ipu_cpmem_set_axi_id() gpu: ipu-cpmem: Add ipu_cpmem_set_rotation() gpu: ipu-cpmem: Add second buffer support to ipu_cpmem_set_image() gpu: ipu-v3: Add more planar formats support gpu: ipu-cpmem: Add ipu_cpmem_dump() gpu: ipu-v3: Add ipu_dump()

drivers/gpu/ipu-v3/Makefile | 3 +- drivers/gpu/ipu-v3/ipu-common.c | 916 +++++++++++++++++----------------- drivers/gpu/ipu-v3/ipu-cpmem.c | 764 ++++++++++++++++++++++++++++ drivers/gpu/ipu-v3/ipu-csi.c | 741 +++++++++++++++++++++++++++ drivers/gpu/ipu-v3/ipu-ic.c | 778 +++++++++++++++++++++++++++++ drivers/gpu/ipu-v3/ipu-prv.h | 44 +- drivers/gpu/ipu-v3/ipu-smfc.c | 156 +++++- drivers/staging/imx-drm/ipuv3-plane.c | 16 +- include/video/imx-ipu-v3.h | 326 ++++++------ 9 files changed, 3072 insertions(+), 672 deletions(-) create mode 100644 drivers/gpu/ipu-v3/ipu-cpmem.c create mode 100644 drivers/gpu/ipu-v3/ipu-csi.c create mode 100644 drivers/gpu/ipu-v3/ipu-ic.c

regards Philipp