diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-07-07 17:56:24 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-12-08 15:17:24 +0300 |
| commit | 65724a19438ce50a7cf85bc2d3172ea237ab05de (patch) | |
| tree | e77d6b1991746f23c6e554e4873a2e5bce8374d6 /drivers/gpu/drm/armada/armada_overlay.c | |
| parent | 2839d45c7d92a521364347dbd023d218a5913e26 (diff) | |
| download | linux-65724a19438ce50a7cf85bc2d3172ea237ab05de.tar.xz | |
drm/armada: wait and cancel any pending frame work at disable
Wait for a second, and if we time out, cancel any pending work when
disabling the primary plane. This ensures that any pending work is
completed or cleaned up prior to the disable taking effect.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_overlay.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c index 1fa8ea8cb2de..cf8442583bfc 100644 --- a/drivers/gpu/drm/armada/armada_overlay.c +++ b/drivers/gpu/drm/armada/armada_overlay.c @@ -270,8 +270,6 @@ static int armada_ovl_plane_disable(struct drm_plane *plane, return 0; dcrtc = drm_to_armada_crtc(dplane->base.base.crtc); - - armada_drm_plane_work_cancel(dcrtc, &dplane->base); armada_drm_crtc_plane_disable(dcrtc, plane); dcrtc->plane = NULL; |