From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Sam Ravnborg <sam@ravnborg.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Emil Velikov <emil.l.velikov@gmail.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Daniel Vetter <daniel.vetter@intel.com>,
Dave Airlie <airlied@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>, Sean Paul <sean@poorly.run>
Subject: [PATCH 06/51] drm/udl: Use drmm_add_final_kfree
Date: Fri, 21 Feb 2020 22:02:34 +0100 [thread overview]
Message-ID: <20200221210319.2245170-7-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200221210319.2245170-1-daniel.vetter@ffwll.ch>
With this we can drop the final kfree from the release function.
v2: We need drm_dev_put to unroll the driver creation (once
drm_dev_init and drmm_add_final_kfree suceeded), otherwise
the drmm_ magic doesn't happen.
v3: Actually squash in the fixup (Laurent).
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
---
drivers/gpu/drm/udl/udl_drv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index e6c1cd77d4d4..6a5594946096 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -10,6 +10,7 @@
#include <drm/drm_fb_helper.h>
#include <drm/drm_file.h>
#include <drm/drm_gem_shmem_helper.h>
+#include <drm/drm_managed.h>
#include <drm/drm_ioctl.h>
#include <drm/drm_probe_helper.h>
#include <drm/drm_print.h>
@@ -38,7 +39,6 @@ static void udl_driver_release(struct drm_device *dev)
udl_fini(dev);
udl_modeset_cleanup(dev);
drm_dev_fini(dev);
- kfree(dev);
}
static struct drm_driver driver = {
@@ -77,11 +77,11 @@ static struct udl_device *udl_driver_create(struct usb_interface *interface)
udl->udev = udev;
udl->drm.dev_private = udl;
+ drmm_add_final_kfree(&udl->drm, udl);
r = udl_init(udl);
if (r) {
- drm_dev_fini(&udl->drm);
- kfree(udl);
+ drm_dev_put(&udl->drm);
return ERR_PTR(r);
}
--
2.24.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: "Sam Ravnborg" <sam@ravnborg.org>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Intel Graphics Development" <intel-gfx@lists.freedesktop.org>,
"Noralf Trønnes" <noralf@tronnes.org>,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Daniel Vetter" <daniel.vetter@intel.com>,
"Dave Airlie" <airlied@redhat.com>,
"Thomas Gleixner" <tglx@linutronix.de>
Subject: [Intel-gfx] [PATCH 06/51] drm/udl: Use drmm_add_final_kfree
Date: Fri, 21 Feb 2020 22:02:34 +0100 [thread overview]
Message-ID: <20200221210319.2245170-7-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200221210319.2245170-1-daniel.vetter@ffwll.ch>
With this we can drop the final kfree from the release function.
v2: We need drm_dev_put to unroll the driver creation (once
drm_dev_init and drmm_add_final_kfree suceeded), otherwise
the drmm_ magic doesn't happen.
v3: Actually squash in the fixup (Laurent).
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
---
drivers/gpu/drm/udl/udl_drv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index e6c1cd77d4d4..6a5594946096 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -10,6 +10,7 @@
#include <drm/drm_fb_helper.h>
#include <drm/drm_file.h>
#include <drm/drm_gem_shmem_helper.h>
+#include <drm/drm_managed.h>
#include <drm/drm_ioctl.h>
#include <drm/drm_probe_helper.h>
#include <drm/drm_print.h>
@@ -38,7 +39,6 @@ static void udl_driver_release(struct drm_device *dev)
udl_fini(dev);
udl_modeset_cleanup(dev);
drm_dev_fini(dev);
- kfree(dev);
}
static struct drm_driver driver = {
@@ -77,11 +77,11 @@ static struct udl_device *udl_driver_create(struct usb_interface *interface)
udl->udev = udev;
udl->drm.dev_private = udl;
+ drmm_add_final_kfree(&udl->drm, udl);
r = udl_init(udl);
if (r) {
- drm_dev_fini(&udl->drm);
- kfree(udl);
+ drm_dev_put(&udl->drm);
return ERR_PTR(r);
}
--
2.24.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-02-21 21:03 UTC|newest]
Thread overview: 173+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 21:02 [PATCH 00/51] drm managed resources, v2 Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 01/51] mm/sl[uo]b: export __kmalloc_track(_node)_caller Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` Daniel Vetter
2020-02-21 21:02 ` [PATCH 02/51] drm/i915: Don't clear drvdata in ->release Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:36 ` Chris Wilson
2020-02-21 21:36 ` [Intel-gfx] " Chris Wilson
2020-02-22 9:48 ` Daniel Vetter
2020-02-22 9:48 ` [Intel-gfx] " Daniel Vetter
2020-02-22 9:50 ` Daniel Vetter
2020-02-22 9:50 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 03/51] drm: add managed resources tied to drm_device Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-25 10:27 ` Andrzej Hajda
2020-02-25 10:27 ` [Intel-gfx] " Andrzej Hajda
2020-02-25 15:03 ` Daniel Vetter
2020-02-25 15:03 ` [Intel-gfx] " Daniel Vetter
2020-02-26 9:21 ` Andrzej Hajda
2020-02-26 9:21 ` [Intel-gfx] " Andrzej Hajda
2020-02-26 10:21 ` Daniel Vetter
2020-02-26 10:21 ` [Intel-gfx] " Daniel Vetter
2020-02-26 14:38 ` Andrzej Hajda
2020-02-26 14:38 ` [Intel-gfx] " Andrzej Hajda
2020-02-21 21:02 ` [PATCH 04/51] drm: Set final_kfree in drm_dev_alloc Daniel Vetter
2020-02-21 21:02 ` [Xen-devel] " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 05/51] drm/mipi_dbi: Use drmm_add_final_kfree in all drivers Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` Daniel Vetter [this message]
2020-02-21 21:02 ` [Intel-gfx] [PATCH 06/51] drm/udl: Use drmm_add_final_kfree Daniel Vetter
2020-02-21 21:02 ` [PATCH 07/51] drm/qxl: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` Daniel Vetter
2020-02-21 21:02 ` [PATCH 08/51] drm/i915: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 09/51] drm/cirrus: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` Daniel Vetter
2020-02-21 21:02 ` [PATCH 10/51] drm/v3d: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 11/51] drm/tidss: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-23 18:50 ` Jyri Sarha
2020-02-23 18:50 ` [Intel-gfx] " Jyri Sarha
2020-02-21 21:02 ` [PATCH 12/51] drm/mcde: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 13/51] drm/vgem: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 14/51] drm/vkms: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 15/51] drm/repaper: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 16/51] drm/inigenic: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 17/51] drm/gm12u320: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-22 11:36 ` Hans de Goede
2020-02-22 11:36 ` [Intel-gfx] " Hans de Goede
2020-02-21 21:02 ` [PATCH 18/51] drm/<drivers>: " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-22 15:16 ` Russell King - ARM Linux admin
2020-02-22 15:16 ` [Intel-gfx] " Russell King - ARM Linux admin
2020-02-27 17:46 ` Daniel Vetter
2020-02-27 17:46 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 19/51] drm: Cleanups after drmm_add_final_kfree rollout Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 20/51] drm: Handle dev->unique with drmm_ Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 21/51] drm: Use drmm_ for drm_dev_init cleanup Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 22/51] drm: manage drm_minor cleanup with drmm_ Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 23/51] drm: Manage drm_gem_init " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 24/51] drm: Manage drm_vblank_cleanup " Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 25/51] drm: Garbage collect drm_dev_fini Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 26/51] drm: Manage drm_mode_config_init with drmm_ Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-23 15:17 ` Noralf Trønnes
2020-02-23 15:17 ` [Intel-gfx] " Noralf Trønnes
2020-02-21 21:02 ` [PATCH 27/51] drm/bochs: Remove leftover drm_atomic_helper_shutdown Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` [PATCH 28/51] drm/bochs: Drop explicit drm_mode_config_cleanup Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` Daniel Vetter
2020-02-21 21:02 ` [PATCH 29/51] drm/cirrus: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` Daniel Vetter
2020-02-21 21:02 ` [PATCH 30/51] drm/cirrus: Fully embrace devm_ Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:02 ` Daniel Vetter
2020-02-21 21:02 ` [PATCH 31/51] drm/ingenic: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-02-21 21:02 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 32/51] drm/mcde: " Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 33/51] drm/mcde: More devm_drm_dev_init Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 34/51] drm/meson: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-02-21 21:03 ` Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` Daniel Vetter
2020-02-21 21:03 ` [PATCH 35/51] drm/pl111: " Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 36/51] drm/rcar-du: " Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` Daniel Vetter
[not found] ` <20200221210319.2245170-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2020-02-21 21:03 ` [PATCH 37/51] drm/rockchip: " Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` Daniel Vetter
2020-02-21 21:03 ` Daniel Vetter
[not found] ` <20200221210319.2245170-38-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2020-02-24 19:13 ` Francesco Lavra
2020-02-24 19:13 ` [Intel-gfx] " Francesco Lavra
2020-02-24 19:13 ` Francesco Lavra
2020-02-24 19:13 ` Francesco Lavra
2020-02-24 20:37 ` Daniel Vetter
2020-02-24 20:37 ` [Intel-gfx] " Daniel Vetter
2020-02-24 20:37 ` Daniel Vetter
2020-02-24 20:37 ` Daniel Vetter
2020-02-21 21:03 ` [PATCH 38/51] drm/stm: " Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` Daniel Vetter
2020-02-21 21:03 ` [PATCH 39/51] drm/shmob: " Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` Daniel Vetter
2020-02-21 21:03 ` [PATCH 40/51] drm/mtk: " Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 41/51] drm/tidss: " Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-23 18:50 ` Jyri Sarha
2020-02-23 18:50 ` [Intel-gfx] " Jyri Sarha
2020-02-21 21:03 ` [PATCH 42/51] drm/gm12u320: More drmm_ Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-22 12:10 ` Hans de Goede
2020-02-22 12:10 ` [Intel-gfx] " Hans de Goede
2020-02-21 21:03 ` [PATCH 43/51] drm/gm12u320: Use devm_drm_dev_init Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-22 12:10 ` Hans de Goede
2020-02-22 12:10 ` [Intel-gfx] " Hans de Goede
2020-02-21 21:03 ` [PATCH 44/51] drm/gm12u320: Use helpers for shutdown/suspend/resume Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-22 12:10 ` Hans de Goede
2020-02-22 12:10 ` [Intel-gfx] " Hans de Goede
2020-02-21 21:03 ` [PATCH 45/51] drm/gm12u320: Simplify upload work Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-22 12:30 ` Hans de Goede
2020-02-22 12:30 ` [Intel-gfx] " Hans de Goede
2020-02-22 13:00 ` Daniel Vetter
2020-02-22 13:00 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 46/51] drm/repaper: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 47/51] drm/mipi-dbi: Move drm_mode_config_init into mipi library Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 48/51] drm/mipi-dbi: Drop explicit drm_mode_config_cleanup call Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 49/51] drm/udl: " Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 50/51] drm/udl: drop drm_driver.release hook Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-21 21:03 ` [PATCH 51/51] drm: Add docs for managed resources Daniel Vetter
2020-02-21 21:03 ` [Intel-gfx] " Daniel Vetter
2020-02-22 2:09 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm managed resources, v2 Patchwork
2020-02-22 2:11 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-02-22 2:33 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-02-24 14:41 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-02-27 18:14 [PATCH 00/51] drm managed resources, v3 Daniel Vetter
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-03-02 22:25 [PATCH 00/51] drm_device managed resources, v4 Daniel Vetter
2020-03-02 22:25 ` [PATCH 06/51] drm/udl: Use drmm_add_final_kfree Daniel Vetter
2020-03-11 9:10 ` Thomas Zimmermann
2020-03-23 14:48 [PATCH 00/51] drm_device managed resources, v5 Daniel Vetter
2020-03-23 14:49 ` [PATCH 06/51] drm/udl: 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=20200221210319.2245170-7-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=airlied@redhat.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
--cc=tglx@linutronix.de \
--cc=tzimmermann@suse.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.