android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: remove drm_driver::gem_free_object

Browse Source 
No drivers set the callback, so remove it all together.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-10-emil.l.velikov@gmail.com
This commit is contained in:
Emil Velikov
2020-05-15 10:50:49 +01:00
committed by Emil Velikov
parent 00c47f569d
commit 1a9458aeb8
3 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/drm_gem.c
View File

@ -975,15 +975,10 @@ drm_gem_object_free(struct kref *kref)
container_of(kref, struct drm_gem_object, refcount); container_of(kref, struct drm_gem_object, refcount);
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
if (obj->funcs) { if (obj->funcs)
obj->funcs->free(obj); obj->funcs->free(obj);
} else if (dev->driver->gem_free_object_unlocked) { else if (dev->driver->gem_free_object_unlocked)
dev->driver->gem_free_object_unlocked(obj); dev->driver->gem_free_object_unlocked(obj);
} else if (dev->driver->gem_free_object) {
WARN_ON(!mutex_is_locked(&dev->struct_mutex));
dev->driver->gem_free_object(obj);
}
} }
EXPORT_SYMBOL(drm_gem_object_free); EXPORT_SYMBOL(drm_gem_object_free);
@ -999,21 +994,10 @@ EXPORT_SYMBOL(drm_gem_object_free);
void void
drm_gem_object_put_unlocked(struct drm_gem_object *obj) drm_gem_object_put_unlocked(struct drm_gem_object *obj)
{ {
struct drm_device *dev;
if (!obj) if (!obj)
return; return;
dev = obj->dev; kref_put(&obj->refcount, drm_gem_object_free);
if (dev->driver->gem_free_object) {
might_lock(&dev->struct_mutex);
if (kref_put_mutex(&obj->refcount, drm_gem_object_free,
&dev->struct_mutex))
mutex_unlock(&dev->struct_mutex);
} else {
kref_put(&obj->refcount, drm_gem_object_free);
}
} }
EXPORT_SYMBOL(drm_gem_object_put_unlocked); EXPORT_SYMBOL(drm_gem_object_put_unlocked);

8
include/drm/drm_drv.h
View File

@ -327,14 +327,6 @@ struct drm_driver {
*/ */
void (*debugfs_init)(struct drm_minor *minor); void (*debugfs_init)(struct drm_minor *minor);
/**
* @gem_free_object: deconstructor for drm_gem_objects
*
* This is deprecated and should not be used by new drivers. Use
* &drm_gem_object_funcs.free instead.
*/
void (*gem_free_object) (struct drm_gem_object *obj);
/** /**
* @gem_free_object_unlocked: deconstructor for drm_gem_objects * @gem_free_object_unlocked: deconstructor for drm_gem_objects
* *

5
include/drm/drm_gem.h
View File

@ -272,8 +272,9 @@ struct drm_gem_object {
* attachment point for the device. This is invariant over the lifetime * attachment point for the device. This is invariant over the lifetime
* of a gem object. * of a gem object.
* *
* The &drm_driver.gem_free_object callback is responsible for cleaning * The &drm_driver.gem_free_object_unlocked callback is responsible for
* up the dma_buf attachment and references acquired at import time. * cleaning up the dma_buf attachment and references acquired at import
* time.
* *
* Note that the drm gem/prime core does not depend upon drivers setting * Note that the drm gem/prime core does not depend upon drivers setting
* this field any more. So for drivers where this doesn't make sense * this field any more. So for drivers where this doesn't make sense