From: Rob Clark Date: Wed, 14 Dec 2011 02:19:35 +0000 (-0600) Subject: drm: disconnect plane from fb/crtc when disabled X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a9971157b6c550644fe19551c21f4b05f7e9475a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drm: disconnect plane from fb/crtc when disabled Since plane->fb and plane->crtc are set in drm_mode_setplane() after update_plane(), They should be cleared after disable(). Signed-off-by: Rob Clark Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index f259a2563204..7710bcb4bd8d 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -348,6 +348,9 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb) ret = plane->funcs->disable_plane(plane); if (ret) DRM_ERROR("failed to disable plane with busy fb\n"); + /* disconnect the plane from the fb and crtc: */ + plane->fb = NULL; + plane->crtc = NULL; } }