From 9583c099b4a08b49e03f7b461c344b6d277fd262 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 10 Dec 2008 15:47:28 -0800 Subject: Revert "Merge branch 'modesetting-gem'" This reverts commit 6656db10551bbb8770dd945b6d81d5138521f208. We really just want the libdrm and ioctl bits, not all the driver stuff. --- linux-core/drm_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-core/drm_gem.c') diff --git a/linux-core/drm_gem.c b/linux-core/drm_gem.c index 607c8b67..ce930265 100644 --- a/linux-core/drm_gem.c +++ b/linux-core/drm_gem.c @@ -105,6 +105,7 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size) kfree(obj); return NULL; } + kref_init(&obj->refcount); kref_init(&obj->handlecount); obj->size = size; @@ -263,9 +264,8 @@ again: spin_lock(&dev->object_name_lock); if (obj->name) { - args->name = (uint64_t) obj->name; spin_unlock(&dev->object_name_lock); - return 0; + return -EEXIST; } ret = idr_get_new_above(&dev->object_name_idr, obj, 1, &obj->name); -- cgit v1.2.3