diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-09-29 00:25:00 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-10-04 04:52:58 +0200 |
| commit | e86fa21b77f4ef840213ecd33230c7c16879a4ac (patch) | |
| tree | b28fb6fb398686eba68d1ab2636e0da6e885c6c2 /drivers/gpu | |
| parent | Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-e86fa21b77f4ef840213ecd33230c7c16879a4ac.tar.xz linux-e86fa21b77f4ef840213ecd33230c7c16879a4ac.zip | |
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 <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160928222500.11827-1-chris@chris-wilson.co.uk
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_plane.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index cd0d475bf3c3..783aef8acab7 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; |