David,

Please incorporate the latest Armada DRM (drm-armada-devel-4.15 branch), which can be found at:

git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-devel-4.15

with SHA1 27ab688f70b6f6b51da4bf56b1237f7beb64d847.

This series builds upon the set of fixes previously submitted to move Armada DRM closer to atomic modeset. We're nowhere near yet, but this series helps to get us closer by unifying some of the differences between the primary and overlay planes.

New features added allows userspace to disable the primary plane if overlay is full screen and there's nothing obscuring the colorkey - this saves having to fetch an entire buffer containing nothing but colorkey when displaying full screen video.

This will update the following files:

drivers/gpu/drm/armada/armada_crtc.c | 433 +++++++++++++++++++++++--------- drivers/gpu/drm/armada/armada_crtc.h | 26 +- drivers/gpu/drm/armada/armada_overlay.c | 300 +++++++++++----------- drivers/gpu/drm/armada/armada_trace.h | 24 +- 4 files changed, 494 insertions(+), 289 deletions(-)

through these changes:

Russell King (29): drm/armada: fix leak of crtc structure drm/armada: fix SRAM powerdown drm/armada: fix UV swap code drm/armada: improve efficiency of armada_drm_plane_calc_addrs() drm/armada: fix YUV planar format framebuffer offsets drm/armada: remove armada_drm_plane_work_cancel() return value drm/armada: add a common frame work allocator drm/armada: store plane in armada_plane_work drm/armada: add work cancel callback drm/armada: wait and cancel any pending frame work at disable drm/armada: allow the primary plane to be disabled drm/armada: clean up armada_drm_crtc_plane_disable() drm/armada: clear plane enable bit when disabling drm/armada: move overlay plane work out from under spinlock drm/armada: move fb retirement into armada_plane_work drm/armada: move event sending into armada_plane_work drm/armada: move regs into armada_plane_work drm/armada: move writes of LCD_SPU_SRAM_PARA1 under lock drm/armada: only enable HSMOOTH if scaling horizontally drm/armada: use drm_plane_helper_check_state() drm/armada: allow armada_drm_plane_work_queue() to silently fail drm/armada: avoid work allocation drm/armada: disable planes at next blanking period drm/armada: re-organise overlay register update generation drm/armada: move overlay plane register update generation drm/armada: wait for previous work when moving overlay window drm/armada: extract register generation from armada_drm_primary_set() drm/armada: implement primary plane update drm/armada: expand overlay trace entry

Many thanks.