Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e86fa21b authored by Chris Wilson's avatar Chris Wilson Committed by Dave Airlie
Browse files

drm: Restore lost drm_framebuffer_unreference in drm_mode_page_flip_ioctl 



Commit 43968d7b ("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: 43968d7b ("drm: Extract drm_plane.[hc]")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160928222500.11827-1-chris@chris-wilson.co.uk


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f5dce665

drivers/gpu/drm/drm_plane.c

+2 −0
Original line number Diff line number Diff line
@@ -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;