diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-06 14:44:14 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-06 23:09:49 +0100 |
| commit | 1dfd9754cd55e424f247d9a2e855ad384e3e90ef (patch) | |
| tree | cadde12a7cfc5ce67767af4d6405726666a50241 /drivers | |
| parent | e167976ee7f5fe4b80f7e8f55e087f6c67cf9562 (diff) | |
| download | linux-3.10-1dfd9754cd55e424f247d9a2e855ad384e3e90ef.tar.gz linux-3.10-1dfd9754cd55e424f247d9a2e855ad384e3e90ef.tar.bz2 linux-3.10-1dfd9754cd55e424f247d9a2e855ad384e3e90ef.zip | |
Revert "drm/i915: Unreference object not handle on creation"
This reverts commit 86f100b136626e91f4f66f3776303475e2e58998.
The kref API requires the handlecount to be initialised to one on object
creation (so that kref_get() doesn't complain upon first use) so the
dalliance in the drivers is required in order to sink the initial
floating reference.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index df5a7135c26..68526f467c8 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -135,12 +135,15 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data, return -ENOMEM; ret = drm_gem_handle_create(file_priv, obj, &handle); - drm_gem_object_unreference_unlocked(obj); - if (ret) + if (ret) { + drm_gem_object_unreference_unlocked(obj); return ret; + } - args->handle = handle; + /* Sink the floating reference from kref_init(handlecount) */ + drm_gem_object_handle_unreference_unlocked(obj); + args->handle = handle; return 0; } |