drm/armada: use drm_plane_force_disable() to disable the overlay plane

Use drm_plane_force_disable() to disable the overlay plane on a mode_set
rather than coding this ourselves.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2015-06-29 17:52:42 +01:00
parent 7c8f7e1abc
commit f8e1406982
1 changed files with 3 additions and 9 deletions

View File

@ -348,17 +348,11 @@ static void armada_drm_crtc_prepare(struct drm_crtc *crtc)
/*
* 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. DRM doesn't provide help with this.
* the new mode parameters.
*/
plane = dcrtc->plane;
if (plane) {
struct drm_framebuffer *fb = plane->fb;
plane->funcs->disable_plane(plane);
plane->fb = NULL;
plane->crtc = NULL;
drm_framebuffer_unreference(fb);
}
if (plane)
drm_plane_force_disable(plane);
}
/* The mode_config.mutex will be held for this call */