On Tue, Mar 03, 2020 at 09:45:20AM +0100, Daniel Vetter wrote:
A few things:
- Update the example driver in the documentation.
- We can drop the old kfree in drm_dev_release.
- Add a WARN_ON check in drm_dev_register to make sure everyone calls drmm_add_final_kfree and there's no leaks.
v2: Restore the full cleanup, I accidentally left some moved code behind when fixing the bisectability of the series.
Missed that when reading first version. Good to see this code-snippet be dropped again.
Cc: Sam Ravnborg sam@ravnborg.org Cc: Dan Carpenter dan.carpenter@oracle.com Signed-off-by: Daniel Vetter daniel.vetter@intel.com
Acked-by: Sam Ravnborg sam@ravnborg.org
drivers/gpu/drm/drm_drv.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 80cfd0f14475..1ee606b4a4f9 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -297,8 +297,6 @@ void drm_minor_release(struct drm_minor *minor)
drm_mode_config_cleanup(drm);drm_dev_fini(drm);
kfree(priv->userspace_facing);
kfree(priv);- }
- static struct drm_driver driver_drm_driver = {
@@ -326,10 +324,11 @@ void drm_minor_release(struct drm_minor *minor)
kfree(drm);return ret;}
drmm_add_final_kfree(drm, priv);drm_mode_config_init(drm);
priv->userspace_facing = kzalloc(..., GFP_KERNEL);
priv->userspace_facing = drmm_kzalloc(..., GFP_KERNEL);if (!priv->userspace_facing)return -ENOMEM;@@ -838,10 +837,7 @@ static void drm_dev_release(struct kref *ref)
drm_managed_release(dev);
- if (!dev->driver->release && !dev->managed.final_kfree) {
WARN_ON(!list_empty(&dev->managed.resources));kfree(dev);- } else if (dev->managed.final_kfree)
Good to see this go again.
- if (dev->managed.final_kfree) kfree(dev->managed.final_kfree);
}
@@ -959,6 +955,8 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) struct drm_driver *driver = dev->driver; int ret;
- WARN_ON(!dev->managed.final_kfree);
- if (drm_dev_needs_global_mutex(dev)) mutex_lock(&drm_global_mutex);
-- 2.24.1
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel