[PATCH] drm: Restore lost drm_framebuffer_unreference in drm_mode_page_flip_ioctl

[PATCH] drm: Restore lost drm_framebuffer_unreference in drm_mode_page_flip_ioctl

[Chris Wilson]

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>
---
 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 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;
-- 
2.9.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

✓ Fi.CI.BAT: success for drm: Restore lost drm_framebuffer_unreference in drm_mode_page_flip_ioctl

[Patchwork]

== Series Details ==

Series: drm: Restore lost drm_framebuffer_unreference in drm_mode_page_flip_ioctl
URL   : https://patchwork.freedesktop.org/series/13045/
State : success

== Summary ==

Series 13045v1 drm: Restore lost drm_framebuffer_unreference in drm_mode_page_flip_ioctl
https://patchwork.freedesktop.org/api/1.0/series/13045/revisions/1/mbox/


fi-bdw-5557u     total:33   pass:26   dwarn:0   dfail:1   fail:0   skip:5  
fi-bsw-n3050     total:33   pass:24   dwarn:0   dfail:1   fail:0   skip:7  
fi-bxt-t5700     total:33   pass:24   dwarn:0   dfail:1   fail:0   skip:7  
fi-byt-j1900     total:33   pass:27   dwarn:0   dfail:1   fail:0   skip:4  
fi-byt-n2820     total:33   pass:23   dwarn:0   dfail:1   fail:0   skip:8  
fi-hsw-4770      total:33   pass:24   dwarn:0   dfail:1   fail:0   skip:7  
fi-hsw-4770r     total:33   pass:24   dwarn:0   dfail:1   fail:0   skip:7  
fi-ilk-650       total:33   pass:12   dwarn:0   dfail:1   fail:0   skip:19 
fi-ivb-3520m     total:33   pass:27   dwarn:0   dfail:1   fail:0   skip:4  
fi-ivb-3770      total:33   pass:27   dwarn:0   dfail:1   fail:0   skip:4  
fi-skl-6260u     total:33   pass:26   dwarn:0   dfail:1   fail:0   skip:5  
fi-skl-6700hq    total:33   pass:25   dwarn:0   dfail:1   fail:0   skip:6  
fi-skl-6700k     total:33   pass:23   dwarn:1   dfail:1   fail:0   skip:7  
fi-skl-6770hq    total:33   pass:26   dwarn:0   dfail:1   fail:0   skip:5  
fi-snb-2520m     total:33   pass:26   dwarn:0   dfail:1   fail:0   skip:5  
fi-snb-2600      total:33   pass:26   dwarn:0   dfail:1   fail:0   skip:5  

Results at /archive/results/CI_IGT_test/Patchwork_2589/

edf68a3aacccc2ad1ff8915fcc8011ad43d53be9 drm-intel-nightly: 2016y-09m-28d-15h-13m-34s UTC integration manifest
40d5bbc drm: Restore lost drm_framebuffer_unreference in drm_mode_page_flip_ioctl

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm: Restore lost drm_framebuffer_unreference in drm_mode_page_flip_ioctl

[Daniel Vetter]

On Wed, Sep 28, 2016 at 11:25:00PM +0100, Chris Wilson wrote:
> 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>

Oops, thanks for catching this, applied to drm-misc.
-Daniel

> ---
>  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 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;
> -- 
> 2.9.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel