Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd2e7931 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: kill gem_free_object_unlocked driver callback 



Not used by any current driver.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 23ddc024

drivers/gpu/drm/drm_gem.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -474,9 +474,7 @@ drm_gem_object_free_unlocked(struct kref *kref) 
	struct drm_gem_object *obj = (struct drm_gem_object *) kref;

	struct drm_gem_object *obj = (struct drm_gem_object *) kref;

	struct drm_device *dev = obj->dev;

	struct drm_device *dev = obj->dev;





	if (dev->driver->gem_free_object_unlocked != NULL)

	if (dev->driver->gem_free_object != NULL) {

		dev->driver->gem_free_object_unlocked(obj);

	else if (dev->driver->gem_free_object != NULL) {

		mutex_lock(&dev->struct_mutex);

		mutex_lock(&dev->struct_mutex);

		dev->driver->gem_free_object(obj);

		dev->driver->gem_free_object(obj);

		mutex_unlock(&dev->struct_mutex);

		mutex_unlock(&dev->struct_mutex);

include/drm/drmP.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -802,7 +802,6 @@ struct drm_driver { 
	 */

	 */

	int (*gem_init_object) (struct drm_gem_object *obj);

	int (*gem_init_object) (struct drm_gem_object *obj);

	void (*gem_free_object) (struct drm_gem_object *obj);

	void (*gem_free_object) (struct drm_gem_object *obj);

	void (*gem_free_object_unlocked) (struct drm_gem_object *obj);





	/* vga arb irq handler */

	/* vga arb irq handler */

	void (*vgaarb_irq)(struct drm_device *dev, bool state);

	void (*vgaarb_irq)(struct drm_device *dev, bool state);