From e86fa21b77f4ef840213ecd33230c7c16879a4ac Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 28 Sep 2016 23:25:00 +0100 Subject: [PATCH] drm: Restore lost drm_framebuffer_unreference in drm_mode_page_flip_ioctl Commit 43968d7b806d ("drm: Extract drm_plane.[hc]") was not the simple cut'n'paste we presumed, somehow it introduced a leak of the page flip target's framebuffer. Fixes: 43968d7b806d ("drm: Extract drm_plane.[hc]") Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: Sean Paul Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/20160928222500.11827-1-chris@chris-wilson.co.uk Signed-off-by: Dave Airlie --- drivers/gpu/drm/drm_plane.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index cd0d475..783aef8 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -898,6 +898,8 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, out: if (ret && crtc->funcs->page_flip_target) drm_crtc_vblank_put(crtc); + if (fb) + drm_framebuffer_unreference(fb); if (crtc->primary->old_fb) drm_framebuffer_unreference(crtc->primary->old_fb); crtc->primary->old_fb = NULL; -- 2.7.4