diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-07-08 10:16:42 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-12-08 12:18:43 +0000 |
| commit | f1f1bffcf01478883f92b69870fd29a4aae6fd64 (patch) | |
| tree | b782bc13da97a48f6b8992250f8c039c091782d4 /drivers/gpu/drm/armada/armada_overlay.c | |
| parent | drm/armada: allow the primary plane to be disabled (diff) | |
| download | linux-f1f1bffcf01478883f92b69870fd29a4aae6fd64.tar.gz linux-f1f1bffcf01478883f92b69870fd29a4aae6fd64.zip | |
drm/armada: clean up armada_drm_crtc_plane_disable()
Merge armada_drm_primary_disable() into armada_drm_crtc_plane_disable()
and rename to armada_drm_plane_disable(). Use this to simplify
armada_ovl_plane_disable().
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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c index cf8442583bfc..a53e7dd26b0b 100644 --- a/drivers/gpu/drm/armada/armada_overlay.c +++ b/drivers/gpu/drm/armada/armada_overlay.c @@ -264,15 +264,12 @@ static int armada_ovl_plane_disable(struct drm_plane *plane, { struct armada_ovl_plane *dplane = drm_to_armada_ovl_plane(plane); struct drm_framebuffer *fb; - struct armada_crtc *dcrtc; - if (!dplane->base.base.crtc) - return 0; + armada_drm_plane_disable(plane, ctx); - dcrtc = drm_to_armada_crtc(dplane->base.base.crtc); - armada_drm_crtc_plane_disable(dcrtc, plane); + if (dplane->base.base.crtc) + drm_to_armada_crtc(dplane->base.base.crtc)->plane = NULL; - dcrtc->plane = NULL; dplane->base.state.ctrl0 = 0; fb = xchg(&dplane->old_fb, NULL); |