diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-07-30 13:53:06 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-07-30 13:53:06 +0300 |
| commit | 6bd02908836ed00aa7fcdc759d490029137c2b30 (patch) | |
| tree | 9e7577e2a3874030815f5e579d4667634cf143ba /drivers/gpu/drm/armada/armada_crtc.c | |
| parent | 34e25ed60ae2cdf91b953dd3772ae48a6bffbd4c (diff) | |
| download | linux-6bd02908836ed00aa7fcdc759d490029137c2b30.tar.xz | |
drm/armada: enable atomic modeset support
Enable atomic modeset helpers, and internal DRM use of atomic modeset
with armada-drm.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_crtc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index e93097d3aa06..375a20757561 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -278,13 +278,12 @@ static void armada_drm_crtc_prepare(struct drm_crtc *crtc) struct drm_plane *plane; /* - * If we have an overlay plane associated with this CRTC, disable - * it before the modeset to avoid its coordinates being outside - * the new mode parameters. + * If we have an overlay plane associated with this CRTC, disable it + * before the modeset to avoid its coordinates being outside the new + * mode parameters. For transitional atomic modeset, we only wait. */ plane = dcrtc->plane; if (plane) { - drm_plane_force_disable(plane); WARN_ON(!armada_drm_plane_work_wait(drm_to_armada_plane(plane), HZ)); } |