From: Sam Ravnborg <sam@ravnborg.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rob Clark <robdclark@chromium.org>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
m.felsch@pengutronix.de,
DRI Development <dri-devel@lists.freedesktop.org>,
Sean Paul <seanpaul@chromium.org>,
Daniel Vetter <daniel.vetter@intel.com>,
Emil Velikov <emil.velikov@collabora.com>
Subject: Re: [PATCH 13/51] drm/vgem: Use drmm_add_final_kfree
Date: Thu, 27 Feb 2020 22:02:42 +0100 [thread overview]
Message-ID: <20200227210242.GD29498@ravnborg.org> (raw)
In-Reply-To: <20200227181522.2711142-14-daniel.vetter@ffwll.ch>
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 <daniel.vetter@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Emil Velikov <emil.velikov@collabora.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Sean Paul <seanpaul@chromium.org>
> Cc: Eric Anholt <eric@anholt.net>
> Cc: Rob Clark <robdclark@chromium.org>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> ---
Acked-by: Sam Ravnborg <sam@ravnborg.org>
> 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 <drm/drm_drv.h>
> #include <drm/drm_file.h>
> #include <drm/drm_ioctl.h>
> +#include <drm/drm_managed.h>
> #include <drm/drm_prime.h>
>
> #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
next prev parent reply other threads:[~2020-02-27 21:02 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 18:14 [PATCH 00/51] drm managed resources, v3 Daniel Vetter
2020-02-27 18:14 ` [PATCH 01/51] mm/sl[uo]b: export __kmalloc_track(_node)_caller Daniel Vetter
2020-02-27 18:14 ` [PATCH 02/51] drm/i915: Don't clear drvdata in ->release Daniel Vetter
2020-02-27 18:14 ` [PATCH 03/51] drm: add managed resources tied to drm_device Daniel Vetter
2020-02-28 22:45 ` Sam Ravnborg
2020-02-28 23:14 ` Daniel Vetter
2020-02-29 11:17 ` Sam Ravnborg
2020-02-29 11:28 ` Daniel Vetter
2020-03-02 9:22 ` Jani Nikula
2020-03-02 9:36 ` Daniel Vetter
2020-03-02 9:39 ` Daniel Vetter
2020-03-02 16:34 ` Sam Ravnborg
2020-02-27 18:14 ` [PATCH 04/51] drm: Set final_kfree in drm_dev_alloc Daniel Vetter
2020-02-27 18:14 ` [PATCH 05/51] drm/mipi_dbi: Use drmm_add_final_kfree in all drivers Daniel Vetter
2020-02-27 20:55 ` Sam Ravnborg
2020-02-27 18:14 ` [PATCH 06/51] drm/udl: Use drmm_add_final_kfree Daniel Vetter
2020-02-27 20:57 ` Sam Ravnborg
2020-02-27 18:14 ` [PATCH 07/51] drm/qxl: " Daniel Vetter
2020-02-27 18:14 ` [PATCH 08/51] drm/i915: " Daniel Vetter
2020-02-27 18:14 ` [PATCH 09/51] drm/cirrus: " Daniel Vetter
2020-02-27 21:01 ` Sam Ravnborg
2020-02-27 18:14 ` [PATCH 10/51] drm/v3d: " Daniel Vetter
2020-02-27 18:14 ` [PATCH 11/51] drm/tidss: " Daniel Vetter
2020-02-27 18:14 ` [PATCH 12/51] drm/mcde: " Daniel Vetter
2020-02-27 18:14 ` [PATCH 13/51] drm/vgem: " Daniel Vetter
2020-02-27 21:02 ` Sam Ravnborg [this message]
2020-02-27 18:14 ` [PATCH 14/51] drm/vkms: " Daniel Vetter
2020-02-27 18:59 ` Rodrigo Siqueira
2020-02-27 18:14 ` [PATCH 15/51] drm/repaper: " Daniel Vetter
2020-02-27 18:14 ` [PATCH 16/51] drm/inigenic: " Daniel Vetter
2020-03-02 20:12 ` Paul Cercueil
2020-02-27 18:14 ` [PATCH 17/51] drm/gm12u320: " Daniel Vetter
2020-02-27 18:14 ` [PATCH 18/51] drm/<drivers>: " Daniel Vetter
2020-02-27 18:35 ` Liviu Dudau
2020-02-27 18:14 ` [PATCH 19/51] drm: Cleanups after drmm_add_final_kfree rollout Daniel Vetter
2020-02-27 18:14 ` [PATCH 20/51] drm: Handle dev->unique with drmm_ Daniel Vetter
2020-02-27 18:14 ` [PATCH 21/51] drm: Use drmm_ for drm_dev_init cleanup Daniel Vetter
2020-02-27 18:14 ` [PATCH 22/51] drm: manage drm_minor cleanup with drmm_ Daniel Vetter
2020-02-27 18:14 ` [PATCH 23/51] drm: Manage drm_gem_init " Daniel Vetter
2020-02-27 18:14 ` [PATCH 24/51] drm: Manage drm_vblank_cleanup " Daniel Vetter
2020-02-27 18:14 ` [PATCH 25/51] drm: Garbage collect drm_dev_fini Daniel Vetter
2020-02-27 18:14 ` [PATCH 26/51] drm: Manage drm_mode_config_init with drmm_ Daniel Vetter
2020-02-28 7:30 ` Thomas Zimmermann
2020-02-28 8:43 ` Daniel Vetter
2020-02-28 9:56 ` Thomas Zimmermann
2020-02-28 20:26 ` Sam Ravnborg
2020-02-28 23:11 ` Daniel Vetter
2020-02-29 10:59 ` Sam Ravnborg
2020-03-02 14:09 ` Daniel Vetter
2020-02-27 18:14 ` [PATCH 27/51] drm/bochs: Remove leftover drm_atomic_helper_shutdown Daniel Vetter
2020-02-27 18:14 ` [PATCH 28/51] drm/bochs: Drop explicit drm_mode_config_cleanup Daniel Vetter
2020-02-27 18:15 ` [PATCH 29/51] drm/cirrus: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-02-28 20:32 ` Sam Ravnborg
2020-02-27 18:15 ` [PATCH 30/51] drm/cirrus: Fully embrace devm_ Daniel Vetter
2020-02-27 18:15 ` [PATCH 31/51] drm/ingenic: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-03-02 20:13 ` Paul Cercueil
2020-02-27 18:15 ` [PATCH 32/51] drm/mcde: " Daniel Vetter
2020-02-27 18:15 ` [PATCH 33/51] drm/mcde: More devm_drm_dev_init Daniel Vetter
2020-02-27 18:15 ` [PATCH 34/51] drm/meson: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-02-27 18:15 ` [PATCH 35/51] drm/pl111: " Daniel Vetter
2020-02-27 18:15 ` [PATCH 36/51] drm/rcar-du: " Daniel Vetter
2020-02-27 18:15 ` [PATCH 37/51] drm/rockchip: " Daniel Vetter
2020-02-28 21:19 ` kbuild test robot
2020-02-28 23:34 ` Daniel Vetter
2020-02-29 1:53 ` kbuild test robot
2020-02-27 18:15 ` [PATCH 38/51] drm/stm: " Daniel Vetter
2020-02-27 18:15 ` [PATCH 39/51] drm/shmob: " Daniel Vetter
2020-02-27 18:15 ` [PATCH 40/51] drm/mtk: " Daniel Vetter
2020-02-27 18:15 ` [PATCH 41/51] drm/tidss: " Daniel Vetter
2020-02-27 18:15 ` [PATCH 42/51] drm/gm12u320: More drmm_ Daniel Vetter
2020-02-27 18:15 ` [PATCH 43/51] drm/gm12u320: Use devm_drm_dev_init Daniel Vetter
2020-02-27 18:15 ` [PATCH 44/51] drm/gm12u320: Use helpers for shutdown/suspend/resume Daniel Vetter
2020-02-27 18:15 ` [PATCH 45/51] drm/gm12u320: Simplify upload work Daniel Vetter
2020-02-27 19:04 ` Hans de Goede
2020-02-27 18:15 ` [PATCH 46/51] drm/repaper: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-02-27 18:15 ` [PATCH 47/51] drm/mipi-dbi: Move drm_mode_config_init into mipi library Daniel Vetter
2020-02-28 20:34 ` Sam Ravnborg
2020-02-27 18:15 ` [PATCH 48/51] drm/mipi-dbi: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-02-28 20:36 ` Sam Ravnborg
2020-02-27 18:15 ` [PATCH 49/51] drm/udl: " Daniel Vetter
2020-02-28 20:37 ` Sam Ravnborg
2020-02-27 18:15 ` [PATCH 50/51] drm/udl: drop drm_driver.release hook Daniel Vetter
2020-02-28 7:43 ` Thomas Zimmermann
2020-02-28 8:40 ` Daniel Vetter
2020-02-28 11:46 ` Thomas Zimmermann
2020-02-28 17:43 ` Daniel Vetter
2020-03-02 8:14 ` Thomas Zimmermann
2020-03-02 9:01 ` Daniel Vetter
2020-02-27 18:15 ` [PATCH 51/51] drm: Add docs for managed resources Daniel Vetter
2020-02-27 20:53 ` Sam Ravnborg
-- strict thread matches above, loose matches on Subject: below --
2020-03-23 14:48 [PATCH 00/51] drm_device managed resources, v5 Daniel Vetter
2020-03-23 14:49 ` [PATCH 13/51] drm/vgem: Use drmm_add_final_kfree Daniel Vetter
2020-03-02 22:25 [PATCH 00/51] drm_device managed resources, v4 Daniel Vetter
2020-03-02 22:25 ` [PATCH 13/51] drm/vgem: Use drmm_add_final_kfree Daniel Vetter
2020-02-21 21:02 [PATCH 00/51] drm managed resources, v2 Daniel Vetter
2020-02-21 21:02 ` [PATCH 13/51] drm/vgem: Use drmm_add_final_kfree Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200227210242.GD29498@ravnborg.org \
--to=sam@ravnborg.org \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.velikov@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=m.felsch@pengutronix.de \
--cc=robdclark@chromium.org \
--cc=seanpaul@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).