From d52031ce0222c44037e1c4265cbef3837269b398 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Mon, 23 Aug 2010 22:53:33 +0200 Subject: [PATCH] --- yaml --- r: 217870 b: refs/heads/master c: fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_gem.c | 4 +--- trunk/include/drm/drmP.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b04cd706c0ee..f06c26638c79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23ddc0243d7313942b94f1a2e44e6394f7bb996e +refs/heads/master: fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b diff --git a/trunk/drivers/gpu/drm/drm_gem.c b/trunk/drivers/gpu/drm/drm_gem.c index bf92d07510df..cff7317d3830 100644 --- a/trunk/drivers/gpu/drm/drm_gem.c +++ b/trunk/drivers/gpu/drm/drm_gem.c @@ -474,9 +474,7 @@ drm_gem_object_free_unlocked(struct kref *kref) struct drm_gem_object *obj = (struct drm_gem_object *) kref; struct drm_device *dev = obj->dev; - if (dev->driver->gem_free_object_unlocked != NULL) - dev->driver->gem_free_object_unlocked(obj); - else if (dev->driver->gem_free_object != NULL) { + if (dev->driver->gem_free_object != NULL) { mutex_lock(&dev->struct_mutex); dev->driver->gem_free_object(obj); mutex_unlock(&dev->struct_mutex); diff --git a/trunk/include/drm/drmP.h b/trunk/include/drm/drmP.h index d5a2b8869246..6dbdbf45cd1a 100644 --- a/trunk/include/drm/drmP.h +++ b/trunk/include/drm/drmP.h @@ -802,7 +802,6 @@ struct drm_driver { */ int (*gem_init_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 */ void (*vgaarb_irq)(struct drm_device *dev, bool state);