From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Engelmayer Subject: [PATCH] nouveau: fix memory leak in nouveau_crtc_page_flip() Date: Sun, 29 Dec 2013 23:08:54 +0100 Message-ID: <20131229230854.4051aa35@spike> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 86A63FA5F4 for ; Sun, 29 Dec 2013 14:08:56 -0800 (PST) Received: from spike ([81.217.122.98]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0LhkiL-1VbYAg0Rof-00mqMd for ; Sun, 29 Dec 2013 23:08:55 +0100 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Ben Skeggs Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Fix a memory leak in the nouveau_crtc_page_flip() error handling path. Signed-off-by: Christian Engelmayer --- This fixes a regression introduced in commit eae389f9b1e08a6e6e8da68937706d89517b1796 Author: Ben Skeggs 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