Hi Dave, could you merge these imx-drm updates? This pull request contains the drm_of_active_endpoint helpers to consolidate code between imx-drm and rockchip and a few imx-drm improvements, most notably fence synchronisation support for importing dma-bufs from etnaviv. regards Philipp The following changes since commit 316e376b658f67cd63351a55093ac5038637a330: Merge tag 'topic/drm-misc-2016-02-08' of git://anongit.freedesktop.org/drm-intel into drm-next (2016-02-09 10:39:11 +1000) are available in the git repository at: git://git.pengutronix.de/git/pza/linux.git tags/imx-drm-next-20160301 for you to fetch changes up to 411b0336cf9fc988ff11de3f1e66587fe88fb980: drm/imx: only enable vblank IRQs when needed (2016-03-01 08:33:41 +0100) ---------------------------------------------------------------- imx-drm vblank IRQ control, fence support, and of endpoint helpers - Add and make use of drm_of_active_endpoint helpers - Silence a noisy dev_info into a dev_dbg - Stop touching primary fb on pageflips - Track flip state explicitly - Keep GEM buffer objects referenced while scanout is active - Implement fence sync by deferring flips to a workqueue for dma-bufs with pending fences - Actually disable vblank IRQs while they are not needed ---------------------------------------------------------------- Liu Ying (1): drm/imx: ipuv3 plane: Replace dev_info with dev_dbg if a plane's CRTC changes Lucas Stach (5): drm/imx: don't touch primary fb on pageflip drm/imx: track flip state explicitly drm/imx: keep GEM object referenced as long as scanout is active drm/imx: implement fence sync drm/imx: only enable vblank IRQs when needed Philipp Zabel (4): drm: add drm_of_encoder_active_endpoint helpers drm/imx: remove imx_drm_encoder_get_mux_id drm/rockchip: remove rockchip_drm_encoder_get_mux_id gpu: ipu-v3: ipu-dc: Simplify display controller microcode setup drivers/gpu/drm/drm_of.c | 34 +++++++ drivers/gpu/drm/imx/dw_hdmi-imx.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 31 ------- drivers/gpu/drm/imx/imx-drm.h | 2 - drivers/gpu/drm/imx/imx-ldb.c | 5 +- drivers/gpu/drm/imx/ipuv3-crtc.c | 133 +++++++++++++++++++++++++--- drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 2 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 30 ------- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 - drivers/gpu/ipu-v3/ipu-dc.c | 53 ++++++----- include/drm/drm_of.h | 33 +++++++ 13 files changed, 222 insertions(+), 109 deletions(-) _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel