diff options
author | Linus Torvalds | 2010-10-01 19:58:31 +0200 |
---|---|---|
committer | Linus Torvalds | 2010-10-01 19:58:31 +0200 |
commit | 18ffe4b18cef097f789d3ff43b45f2938cebe241 (patch) | |
tree | 59a23065256d235eb85a7afcd2d0efa628d16e9c /drivers/gpu/drm/radeon/radeon_gem.c | |
parent | Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux (diff) | |
parent | vmwgfx: Fix fb VRAM pinning failure due to fragmentation (diff) | |
download | kernel-qcow2-linux-18ffe4b18cef097f789d3ff43b45f2938cebe241.tar.gz kernel-qcow2-linux-18ffe4b18cef097f789d3ff43b45f2938cebe241.tar.xz kernel-qcow2-linux-18ffe4b18cef097f789d3ff43b45f2938cebe241.zip |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
vmwgfx: Fix fb VRAM pinning failure due to fragmentation
vmwgfx: Remove initialisation of dev::devname
vmwgfx: Enable use of the vblank system
vmwgfx: vt-switch (master drop) fixes
drm/vmwgfx: Fix breakage introduced by commit "drm: block userspace under allocating buffer and having drivers overwrite it (v2)"
drm: Hold the mutex when dropping the last GEM reference (v2)
drm/gem: handlecount isn't really a kref so don't make it one.
drm: i810/i830: fix locked ioctl variant
drm/radeon/kms: add quirk for MSI K9A2GM motherboard
drm/radeon/kms: fix potential segfault in r600_ioctl_wait_idle
drm: Prune GEM vma entries
drm/radeon/kms: fix up encoder info messages for DFP6
drm/radeon: fix PCI ID 5657 to be an RV410
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_gem.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index c578f265b24c..d1e595d91723 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -201,11 +201,11 @@ int radeon_gem_create_ioctl(struct drm_device *dev, void *data, return r; } r = drm_gem_handle_create(filp, gobj, &handle); + /* drop reference from allocate - handle holds it now */ + drm_gem_object_unreference_unlocked(gobj); if (r) { - drm_gem_object_unreference_unlocked(gobj); return r; } - drm_gem_object_handle_unreference_unlocked(gobj); args->handle = handle; return 0; } |