aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-08-23 16:53:33 -0400
committerDave Airlie <airlied@redhat.com>2010-08-29 19:38:18 -0400
commitfd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b (patch)
treeea2d64ccff37e5d97ed94abab8851ac89dd5d1da
parent23ddc0243d7313942b94f1a2e44e6394f7bb996e (diff)
drm: kill gem_free_object_unlocked driver callback
Not used by any current driver. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_gem.c4
-rw-r--r--include/drm/drmP.h1
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index bf92d07510df..cff7317d3830 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -474,9 +474,7 @@ drm_gem_object_free_unlocked(struct kref *kref)
474 struct drm_gem_object *obj = (struct drm_gem_object *) kref; 474 struct drm_gem_object *obj = (struct drm_gem_object *) kref;
475 struct drm_device *dev = obj->dev; 475 struct drm_device *dev = obj->dev;
476 476
477 if (dev->driver->gem_free_object_unlocked != NULL) 477 if (dev->driver->gem_free_object != NULL) {
478 dev->driver->gem_free_object_unlocked(obj);
479 else if (dev->driver->gem_free_object != NULL) {
480 mutex_lock(&dev->struct_mutex); 478 mutex_lock(&dev->struct_mutex);
481 dev->driver->gem_free_object(obj); 479 dev->driver->gem_free_object(obj);
482 mutex_unlock(&dev->struct_mutex); 480 mutex_unlock(&dev->struct_mutex);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index d5a2b8869246..6dbdbf45cd1a 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -802,7 +802,6 @@ struct drm_driver {
802 */ 802 */
803 int (*gem_init_object) (struct drm_gem_object *obj); 803 int (*gem_init_object) (struct drm_gem_object *obj);
804 void (*gem_free_object) (struct drm_gem_object *obj); 804 void (*gem_free_object) (struct drm_gem_object *obj);
805 void (*gem_free_object_unlocked) (struct drm_gem_object *obj);
806 805
807 /* vga arb irq handler */ 806 /* vga arb irq handler */
808 void (*vgaarb_irq)(struct drm_device *dev, bool state); 807 void (*vgaarb_irq)(struct drm_device *dev, bool state);