dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] nouveau: fix memory leak in nouveau_crtc_page_flip()
@ 2013-12-29 22:08 Christian Engelmayer
  0 siblings, 0 replies; only message in thread
From: Christian Engelmayer @ 2013-12-29 22:08 UTC (permalink / raw)
  To: Ben Skeggs; +Cc: dri-devel

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

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

   commit eae389f9b1e08a6e6e8da68937706d89517b1796
   Author: Ben Skeggs <bskeggs@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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2013-12-29 22:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-29 22:08 [PATCH] nouveau: fix memory leak in nouveau_crtc_page_flip() Christian Engelmayer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox