From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A594C3F2C0 for ; Thu, 27 Feb 2020 21:02:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 043DF24690 for ; Thu, 27 Feb 2020 21:02:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 043DF24690 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 832816E97E; Thu, 27 Feb 2020 21:02:47 +0000 (UTC) Received: from asavdk4.altibox.net (asavdk4.altibox.net [109.247.116.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 096266E97E; Thu, 27 Feb 2020 21:02:46 +0000 (UTC) Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk4.altibox.net (Postfix) with ESMTPS id 4835680441; Thu, 27 Feb 2020 22:02:43 +0100 (CET) Date: Thu, 27 Feb 2020 22:02:42 +0100 From: Sam Ravnborg To: Daniel Vetter Subject: Re: [PATCH 13/51] drm/vgem: Use drmm_add_final_kfree Message-ID: <20200227210242.GD29498@ravnborg.org> References: <20200227181522.2711142-1-daniel.vetter@ffwll.ch> <20200227181522.2711142-14-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200227181522.2711142-14-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=XpTUx2N9 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=QyXUC8HyAAAA:8 a=QX4gbG5DAAAA:8 a=taGs_qngAAAA:8 a=cm27Pg_UAAAA:8 a=-VAfIpHNAAAA:8 a=7gkXJVJtAAAA:8 a=0FZN23qlbBZI_fe2_qcA:9 a=CjuIK1q_8ugA:10 a=AbAUZ8qAyYyZVLSsDulk:22 a=DM_PlaNYpjARcMQr2apF:22 a=xmb-EsYY8bH0VWELuYED:22 a=srlwD-8ojaedGGhPAyx8:22 a=E9Po1WZjFZOl8hwRPBS3:22 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Intel Graphics Development , m.felsch@pengutronix.de, DRI Development , Sean Paul , Daniel Vetter , Emil Velikov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Feb 27, 2020 at 07:14:44PM +0100, Daniel Vetter wrote: > With this we can drop the final kfree from the release function. > > v2: After drm_dev_init/drmm_add_final_kfree we need to clean up > everything through a drm_dev_put. Rework the unwind code to match > that. > > Signed-off-by: Daniel Vetter > Cc: Daniel Vetter > Cc: Emil Velikov > Cc: Chris Wilson > Cc: Sean Paul > Cc: Eric Anholt > Cc: Rob Clark > Cc: Sam Ravnborg > --- Acked-by: Sam Ravnborg > drivers/gpu/drm/vgem/vgem_drv.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c > index 909eba43664a..7486014e9149 100644 > --- a/drivers/gpu/drm/vgem/vgem_drv.c > +++ b/drivers/gpu/drm/vgem/vgem_drv.c > @@ -39,6 +39,7 @@ > #include > #include > #include > +#include > #include > > #include "vgem_drv.h" > @@ -432,8 +433,6 @@ static void vgem_release(struct drm_device *dev) > > platform_device_unregister(vgem->platform); > drm_dev_fini(&vgem->drm); > - > - kfree(vgem); > } > > static struct drm_driver vgem_driver = { > @@ -489,16 +488,19 @@ static int __init vgem_init(void) > &vgem_device->platform->dev); > if (ret) > goto out_unregister; > + drmm_add_final_kfree(&vgem_device->drm, vgem_device); > > /* Final step: expose the device/driver to userspace */ > - ret = drm_dev_register(&vgem_device->drm, 0); > + ret = drm_dev_register(&vgem_device->drm, 0); > if (ret) > - goto out_fini; > + goto out_put; > > return 0; > > -out_fini: > - drm_dev_fini(&vgem_device->drm); > +out_put: > + drm_dev_put(&vgem_device->drm); > + return ret; > + > out_unregister: > platform_device_unregister(vgem_device->platform); > out_free: > -- > 2.24.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel