[PATCH] nouveau: fix memory leak in nouveau_crtc_page_flip()

Christian Engelmayer cengelma at gmx.at
Sun Dec 29 14:08:54 PST 2013


Fix a memory leak in the nouveau_crtc_page_flip() error handling path.

Signed-off-by: Christian Engelmayer <cengelma at gmx.at>
---
This fixes a regression introduced in 

   commit eae389f9b1e08a6e6e8da68937706d89517b1796
   Author: Ben Skeggs <bskeggs at redhat.com>
   Date:   Wed Nov 13 10:17:17 2013 +1000

drm/nouveau: always queue flips relative to kernel channel activity
---
 drivers/gpu/drm/nouveau/nouveau_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 29c3efd..25ea82f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -610,7 +610,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
 	ret = nouveau_fence_sync(fence, chan);
 	nouveau_fence_unref(&fence);
 	if (ret)
-		return ret;
+		goto fail_free;
 
 	if (new_bo != old_bo) {
 		ret = nouveau_bo_pin(new_bo, TTM_PL_FLAG_VRAM);
-- 
1.8.3.2


More information about the dri-devel mailing list