diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-17 13:58:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-17 13:58:34 +1000 |
| commit | c87a8d8dcd2587c203f3dd8a3c5c15d1e128ec0d (patch) | |
| tree | 46a860489285c11834ec1241cb2c95b95d60c5d4 /drivers/gpu | |
| parent | a3a88a668ffe8f9771a525a2b00570f8a4c29286 (diff) | |
| download | linux-3.10-c87a8d8dcd2587c203f3dd8a3c5c15d1e128ec0d.tar.gz linux-3.10-c87a8d8dcd2587c203f3dd8a3c5c15d1e128ec0d.tar.bz2 linux-3.10-c87a8d8dcd2587c203f3dd8a3c5c15d1e128ec0d.zip | |
drm/radeon: fixup refcounts in radeon dumb create ioctl.
This was using old gem refcounting methods, fix it to be the same
as the normal create ioctl.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_gem.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index 723cd19cd22..aa1ca2dea42 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -358,6 +358,7 @@ int radeon_mode_dumb_create(struct drm_file *file_priv, { struct radeon_device *rdev = dev->dev_private; struct drm_gem_object *gobj; + uint32_t handle; int r; args->pitch = radeon_align_pitch(rdev, args->width, args->bpp, 0) * ((args->bpp + 1) / 8); @@ -371,12 +372,13 @@ int radeon_mode_dumb_create(struct drm_file *file_priv, if (r) return -ENOMEM; - r = drm_gem_handle_create(file_priv, gobj, &args->handle); + r = drm_gem_handle_create(file_priv, 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; } |