From patchwork Mon Jan 20 19:26:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 3514211 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D314BC02DC for ; Mon, 20 Jan 2014 19:27:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AB602010E for ; Mon, 20 Jan 2014 19:27:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 65CE7200FF for ; Mon, 20 Jan 2014 19:27:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BEC5BFAC2E; Mon, 20 Jan 2014 11:26:59 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-bk0-f49.google.com (mail-bk0-f49.google.com [209.85.214.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C1CCFAEFE for ; Mon, 20 Jan 2014 11:26:55 -0800 (PST) Received: by mail-bk0-f49.google.com with SMTP id v15so610946bkz.22 for ; Mon, 20 Jan 2014 11:26:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZLbDoe6gKEFFuifw4klDADgIWbFEtO/asfShDQKhCsI=; b=eMzxpwZcD9fx0N6PoA4uGPzDGHdDTLh53yV/oXTdXVFUfNOxmP0H9Q9brp0aU2S/2o XF6iKum1ukv9leZjFTeW8YgBbZ5L40f0MlfnfoHpGoHRJfLzb4WcHbB7c313Q102v0C1 GqXTxLaRLgKZbP/6bWJjAf+DTnt0PK4njEfb1ZeEk+CjEOPVUybFw5EScitUCuwByE2Z fxhQTgoBpqHpbArHmcsWdXwq1AgnPPKJwHUU/FV4TC1i68dKnLuoSlOj7fyRsKqCKC86 vfxThI8T6MdvUAuq12xGL2rMInInHklM/3utkP2iG9dkQBoTq6ALZrVITwpAEQ0G/HWx xmUA== X-Received: by 10.204.116.70 with SMTP id l6mr8225bkq.130.1390246014270; Mon, 20 Jan 2014 11:26:54 -0800 (PST) Received: from david-ub.localdomain (stgt-5f7292c1.pool.mediaWays.net. [95.114.146.193]) by mx.google.com with ESMTPSA id tf11sm1780282bkb.17.2014.01.20.11.26.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Jan 2014 11:26:53 -0800 (PST) From: David Herrmann To: dri-devel@lists.freedesktop.org Subject: [PATCH 5/7] drm/gem: free vma-node during object-cleanup Date: Mon, 20 Jan 2014 20:26:27 +0100 Message-Id: <1390245989-13280-5-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1390245989-13280-1-git-send-email-dh.herrmann@gmail.com> References: <1390245989-13280-1-git-send-email-dh.herrmann@gmail.com> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All drivers currently need to clean up the vma-node manually. There is no fancy logic involved so lets just clean it up unconditionally. The vma-manager correctly catches multiple calls so we are fine. Signed-off-by: David Herrmann --- drivers/gpu/drm/drm_gem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index c1eaf35..7bf374e 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -692,6 +692,8 @@ drm_gem_object_release(struct drm_gem_object *obj) if (obj->filp) fput(obj->filp); + + drm_gem_free_mmap_offset(obj); } EXPORT_SYMBOL(drm_gem_object_release);