Hi Dave, please consider merging this tag containing the latest active plane reconfiguration patches, several fixes and cleanups, and image conversion support for the V4L2 drivers to build upon. The active plane reconfiguration patch (v4) will conflict with the v2 patch that already went into v4.8-rc5 to fix a regression. I have not yet included a backmerge with this tag, because that would mean also pulling in v4.8-rc3. Please let me know if I also should prepare a pull request containing the merges. regards Philipp The following changes since commit 2b58e98d42af854037439f51bd89f83dbfa8e30d: drm/atomic-helper: Add NO_DISABLE_AFTER_MODESET flag support for plane commit (2016-08-29 11:29:37 +0200) are available in the git repository at: git://git.pengutronix.de/git/pza/linux.git tags/imx-drm-next-2016-09-19 for you to fetch changes up to cd98e85a6b786da83e0b120b53a182d100c19c9b: gpu: ipu-v3: Add queued image conversion support (2016-09-19 08:30:27 +0200) ---------------------------------------------------------------- imx-drm active plane reconfiguration, cleanup, FSU/IC/IRT/VDIC support - add active plane reconfiguration support (v4), use the atomic_disable callback - stop calling disable_plane manually in the plane destroy path - let mode cleanup destroy mode objects on driver unbind - drop deprecated load/unload drm_driver ops - add exclusive fence to plane state, so the atomic helper can wait on them, remove the open-coded fence wait from imx-drm - add low level deinterlacer (VDIC) support - add support for channel linking via the frame synchronisation unit (FSU) - add queued image conversion support for memory-to-memory scaling, rotation, and color space conversion, using IC and IRT. ---------------------------------------------------------------- LABBE Corentin (1): gpu: ipu-v3: fix a possible NULL dereference Liu Ying (4): gpu: ipu-v3: Do not wait for DMFC FIFO to clear when disabling DMFC channel drm/imx: ipuv3-crtc: Use the callback ->atomic_disable instead of ->disable drm/imx: Use DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET flag drm/imx: Add active plane reconfiguration support Lucas Stach (6): drm/imx: don't call disable_plane in plane destroy path drm/imx: drop deprecated load/unload drm_driver ops drm/imx: don't destroy mode objects manually on driver unbind drm/imx: fold ipu_plane_disable into ipu_disable_plane drm/imx: add exclusive fence to plane state drm/imx: imx-ldb: detach panel on unbind Philipp Zabel (2): drm/imx: imx-ldb: detach bridge on unbind drm/imx: parallel-display: detach bridge or panel on unbind Steve Longerbeam (4): gpu: ipu-v3: Add Video Deinterlacer unit gpu: ipu-v3: Add FSU channel linking support gpu: ipu-v3: Add ipu_rot_mode_is_irt() gpu: ipu-v3: Add queued image conversion support drivers/gpu/drm/bridge/dw-hdmi.c | 3 - drivers/gpu/drm/imx/imx-drm-core.c | 332 ++++--- drivers/gpu/drm/imx/imx-ldb.c | 9 +- drivers/gpu/drm/imx/imx-tve.c | 3 - drivers/gpu/drm/imx/ipuv3-crtc.c | 17 +- drivers/gpu/drm/imx/ipuv3-plane.c | 37 +- drivers/gpu/drm/imx/parallel-display.c | 6 +- drivers/gpu/ipu-v3/Makefile | 3 +- drivers/gpu/ipu-v3/ipu-common.c | 157 ++- drivers/gpu/ipu-v3/ipu-dmfc.c | 18 +- drivers/gpu/ipu-v3/ipu-ic.c | 2 +- drivers/gpu/ipu-v3/ipu-image-convert.c | 1709 ++++++++++++++++++++++++++++++++ drivers/gpu/ipu-v3/ipu-prv.h | 38 + drivers/gpu/ipu-v3/ipu-vdi.c | 243 +++++ include/video/imx-ipu-image-convert.h | 207 ++++ include/video/imx-ipu-v3.h | 58 +- 16 files changed, 2612 insertions(+), 230 deletions(-) create mode 100644 drivers/gpu/ipu-v3/ipu-image-convert.c create mode 100644 drivers/gpu/ipu-v3/ipu-vdi.c create mode 100644 include/video/imx-ipu-image-convert.h _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel