Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=v4.16.17 2018-01-04T23:51:43+00:00 2018-01-04T23:51:43+00:00 Dave Airlie airlied@redhat.com 2018-01-04T23:43:46+00:00 urn:sha1:bcd21a4786eae9f661acf552463fb718b24ee5f4 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. [airlied: fixup for atomic plane helper rename: a01cb8ba3f6282934cff65e89ab36b18b14cbe27 Author: Ville Syrjälä <ville.syrjala@linux.intel.com> Date: Wed Nov 1 22:16:19 2017 +0200 drm: Move drm_plane_helper_check_state() into drm_atomic_helper.c ] * 'drm-armada-devel-4.15' of git://git.armlinux.org.uk/~rmk/linux-arm: (29 commits) drm/armada: expand overlay trace entry drm/armada: implement primary plane update drm/armada: extract register generation from armada_drm_primary_set() drm/armada: wait for previous work when moving overlay window drm/armada: move overlay plane register update generation drm/armada: re-organise overlay register update generation drm/armada: disable planes at next blanking period drm/armada: avoid work allocation drm/armada: allow armada_drm_plane_work_queue() to silently fail drm/armada: use drm_plane_helper_check_state() drm/armada: only enable HSMOOTH if scaling horizontally drm/armada: move writes of LCD_SPU_SRAM_PARA1 under lock drm/armada: move regs into armada_plane_work drm/armada: move event sending into armada_plane_work drm/armada: move fb retirement into armada_plane_work drm/armada: move overlay plane work out from under spinlock drm/armada: clear plane enable bit when disabling drm/armada: clean up armada_drm_crtc_plane_disable() drm/armada: allow the primary plane to be disabled drm/armada: wait and cancel any pending frame work at disable ... 2017-12-08T12:22:02+00:00 Russell King rmk+kernel@armlinux.org.uk 2017-07-08T09:22:45+00:00 urn:sha1:27ab688f70b6f6b51da4bf56b1237f7beb64d847 Add CRTC and source positions to the Armada overlay trace entry. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> 2017-12-08T12:22:01+00:00 Russell King rmk+kernel@armlinux.org.uk 2017-07-08T09:22:37+00:00 urn:sha1:950bc137c31294a279fb0cf045e28fdb0a066bcd Implement primary plane update without having to go through a modeset to achieve that; the hardware does not require such complexity. This means we treat the primary plane as any other, allowing the format, size, position and scaling to be updated via the normal plane ioctls. This also allows us to seemlessly disable and re-enable the primary plane when (eg) displaying full-frame video without any graphic clipping the overlaid video - which saves wasting memory bandwidth needlessly verifying that the colorkey is indeed filling the entire primary plane. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> 2017-12-08T12:21:59+00:00 Russell King rmk+kernel@armlinux.org.uk 2017-07-08T09:22:35+00:00 urn:sha1:11df53dc5bd832dcc4472bdd5e98ac0d9709e739 Extract the register generation from armada_drm_primary_set(), so that it can be re-used. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> 2017-12-08T12:21:57+00:00 Russell King rmk+kernel@armlinux.org.uk 2017-07-08T09:22:34+00:00 urn:sha1:07da3c787a273b6d8478b416a694a740c85bdf72 We must wait for the previous plane work to complete before moving the overlay window, as it could overwrite our positioning update. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> 2017-12-08T12:21:53+00:00 Russell King rmk+kernel@armlinux.org.uk 2017-07-08T09:22:33+00:00 urn:sha1:65843e9af759eb0d1a0f0ee6dc64b3162793132c Move the overlay plane register update generation to a separate function as this is independent of the legacy or atomic update. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> 2017-12-08T12:20:57+00:00 Russell King rmk+kernel@armlinux.org.uk 2017-07-08T09:22:31+00:00 urn:sha1:d19f6ee5051be073939b6a013455355711708215 Re-organise overlay register generation so that we do not have to wait for the previous update to complete while creating the new state. This allows the update to be fully prepared before queueing it for the next interrupt. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> 2017-12-08T12:20:52+00:00 Russell King rmk+kernel@armlinux.org.uk 2017-07-08T09:22:27+00:00 urn:sha1:890ca8df5a75b3bfdab86bec03aa60cff90a573e Disable planes at the next blanking period rather than immediately. In order to achieve this, we need to delay the clearing of dcrtc->plane until after the next blanking period, so move that into a separate work function. To avoid races, we also need to move its assignment in the overlay code. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> 2017-12-08T12:20:00+00:00 Russell King rmk+kernel@armlinux.org.uk 2017-07-08T09:22:25+00:00 urn:sha1:d924155dae5c59fc69be98392306970510768d0b Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> 2017-12-08T12:19:58+00:00 Russell King rmk+kernel@armlinux.org.uk 2017-07-08T09:22:23+00:00 urn:sha1:c93dfdcd0521cbdfccab147c5c5a615ba9977a89 Avoid printing an error message when armada_drm_plane_work_queue() is unable to get the vblank (eg, because we're doing a modeset.) Continue to report the failure to the caller, so the caller can handle this. Move the error message into armada_ovl_plane_update(). Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>