]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/i915: Unreference object not handle on creation
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 24 Jul 2010 20:03:49 +0000 (21:03 +0100)
committerEric Anholt <eric@anholt.net>
Mon, 2 Aug 2010 02:58:06 +0000 (19:58 -0700)
When creating an object, we create the handle by which it is known to
the process and which own the reference to the object. That reference to
the new handle is what we want to transfer to the process, not the lost
reference to the object; so free the local object reference *not* the
process's handle reference.

This brings i915_gem_object_create_ioctl() into line with
drm_gem_open_ioctl()

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/i915_gem.c

index eeb768818136c3c5b35637612029304bba657d65..4efd4fd3b340e8f185b407ddf9764ab446ecd9ba 100644 (file)
@@ -128,8 +128,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,
                return -ENOMEM;
 
        ret = drm_gem_handle_create(file_priv, obj, &handle);
-       drm_gem_object_handle_unreference_unlocked(obj);
-
+       drm_gem_object_unreference_unlocked(obj);
        if (ret)
                return ret;