Skip to content

Commit

Permalink
Use drm_gem_object_[handle_]unreference_unlocked where possible
Browse files Browse the repository at this point in the history 
Mostly obvious simplifications.

The i915 pread/pwrite ioctls, intel_overlay_put_image and
nouveau_gem_new were incorrectly using the locked versions
without locking: this is also fixed in this patch.

Signed-off-by: Luca Barbieri <luca@luca-barbieri.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Luca Barbieri authored and Dave Airlie committed Feb 11, 2010
1 parent c3ae90c commit bc9025b
Show file tree
Hide file tree
Showing 15 changed files with 47 additions and 121 deletions.
21 changes: 5 additions & 16 deletions drivers/gpu/drm/drm_gem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)
idr_remove(&filp->object_idr, handle);
spin_unlock(&filp->table_lock);

mutex_lock(&dev->struct_mutex);
drm_gem_object_handle_unreference(obj);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_handle_unreference_unlocked(obj);

return 0;
}
Expand Down Expand Up @@ -325,9 +323,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
}

err:
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(obj);
return ret;
}

Expand Down Expand Up @@ -358,9 +354,7 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data,
return -ENOENT;

ret = drm_gem_handle_create(file_priv, obj, &handle);
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(obj);
if (ret)
return ret;

Expand Down Expand Up @@ -390,7 +384,7 @@ drm_gem_object_release_handle(int id, void *ptr, void *data)
{
struct drm_gem_object *obj = ptr;

drm_gem_object_handle_unreference(obj);
drm_gem_object_handle_unreference_unlocked(obj);

return 0;
}
Expand All @@ -403,12 +397,10 @@ drm_gem_object_release_handle(int id, void *ptr, void *data)
void
drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
{
mutex_lock(&dev->struct_mutex);
idr_for_each(&file_private->object_idr,
&drm_gem_object_release_handle, NULL);

idr_destroy(&file_private->object_idr);
mutex_unlock(&dev->struct_mutex);
}

static void
Expand Down Expand Up @@ -516,11 +508,8 @@ EXPORT_SYMBOL(drm_gem_vm_open);
void drm_gem_vm_close(struct vm_area_struct *vma)
{
struct drm_gem_object *obj = vma->vm_private_data;
struct drm_device *dev = obj->dev;

mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(obj);
}
EXPORT_SYMBOL(drm_gem_vm_close);

Expand Down
16 changes: 6 additions & 10 deletions drivers/gpu/drm/i915/i915_gem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,
return -ENOMEM;

ret = drm_gem_handle_create(file_priv, obj, &handle);
mutex_lock(&dev->struct_mutex);
drm_gem_object_handle_unreference(obj);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_handle_unreference_unlocked(obj);

if (ret)
return ret;
Expand Down Expand Up @@ -488,7 +486,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
*/
if (args->offset > obj->size || args->size > obj->size ||
args->offset + args->size > obj->size) {
drm_gem_object_unreference(obj);
drm_gem_object_unreference_unlocked(obj);
return -EINVAL;
}

Expand All @@ -501,7 +499,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
file_priv);
}

drm_gem_object_unreference(obj);
drm_gem_object_unreference_unlocked(obj);

return ret;
}
Expand Down Expand Up @@ -961,7 +959,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
*/
if (args->offset > obj->size || args->size > obj->size ||
args->offset + args->size > obj->size) {
drm_gem_object_unreference(obj);
drm_gem_object_unreference_unlocked(obj);
return -EINVAL;
}

Expand Down Expand Up @@ -995,7 +993,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
DRM_INFO("pwrite failed %d\n", ret);
#endif

drm_gem_object_unreference(obj);
drm_gem_object_unreference_unlocked(obj);

return ret;
}
Expand Down Expand Up @@ -1138,9 +1136,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
PROT_READ | PROT_WRITE, MAP_SHARED,
args->offset);
up_write(&current->mm->mmap_sem);
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(obj);
if (IS_ERR((void *)addr))
return addr;

Expand Down
4 changes: 1 addition & 3 deletions drivers/gpu/drm/i915/i915_gem_tiling.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,9 +438,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
obj_priv = obj->driver_private;

if (!i915_tiling_ok(dev, args->stride, obj->size, args->tiling_mode)) {
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(obj);
return -EINVAL;
}

Expand Down
13 changes: 4 additions & 9 deletions drivers/gpu/drm/i915/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3434,11 +3434,10 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
intel_crtc->cursor_bo = bo;

return 0;
fail:
mutex_lock(&dev->struct_mutex);
fail_locked:
drm_gem_object_unreference(bo);
mutex_unlock(&dev->struct_mutex);
fail:
drm_gem_object_unreference_unlocked(bo);
return ret;
}

Expand Down Expand Up @@ -4351,9 +4350,7 @@ static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)
intelfb_remove(dev, fb);

drm_framebuffer_cleanup(fb);
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(intel_fb->obj);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(intel_fb->obj);

kfree(intel_fb);
}
Expand Down Expand Up @@ -4416,9 +4413,7 @@ intel_user_framebuffer_create(struct drm_device *dev,

ret = intel_framebuffer_create(dev, mode_cmd, &fb, obj);
if (ret) {
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(obj);
return NULL;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_overlay.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
out_unlock:
mutex_unlock(&dev->struct_mutex);
mutex_unlock(&dev->mode_config.mutex);
drm_gem_object_unreference(new_bo);
drm_gem_object_unreference_unlocked(new_bo);
kfree(params);

return ret;
Expand Down
7 changes: 2 additions & 5 deletions drivers/gpu/drm/nouveau/nouveau_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,8 @@ nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb)
if (drm_fb->fbdev)
nouveau_fbcon_remove(dev, drm_fb);

if (fb->nvbo) {
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(fb->nvbo->gem);
mutex_unlock(&dev->struct_mutex);
}
if (fb->nvbo)
drm_gem_object_unreference_unlocked(fb->nvbo->gem);

drm_framebuffer_cleanup(drm_fb);
kfree(fb);
Expand Down
4 changes: 1 addition & 3 deletions drivers/gpu/drm/nouveau/nouveau_fbcon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,10 +401,8 @@ nouveau_fbcon_remove(struct drm_device *dev, struct drm_framebuffer *fb)

unregister_framebuffer(info);
nouveau_bo_unmap(nouveau_fb->nvbo);
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(nouveau_fb->nvbo->gem);
drm_gem_object_unreference_unlocked(nouveau_fb->nvbo->gem);
nouveau_fb->nvbo = NULL;
mutex_unlock(&dev->struct_mutex);
if (par)
drm_fb_helper_free(&par->helper);
framebuffer_release(info);
Expand Down
26 changes: 7 additions & 19 deletions drivers/gpu/drm/nouveau/nouveau_gem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,10 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,

ret = drm_gem_handle_create(file_priv, nvbo->gem, &req->info.handle);
out:
mutex_lock(&dev->struct_mutex);
drm_gem_object_handle_unreference(nvbo->gem);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_handle_unreference_unlocked(nvbo->gem);

if (ret)
drm_gem_object_unreference(nvbo->gem);
drm_gem_object_unreference_unlocked(nvbo->gem);
return ret;
}

Expand Down Expand Up @@ -865,9 +863,7 @@ nouveau_gem_ioctl_pin(struct drm_device *dev, void *data,
req->domain = NOUVEAU_GEM_DOMAIN_VRAM;

out:
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(gem);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(gem);

return ret;
}
Expand All @@ -891,9 +887,7 @@ nouveau_gem_ioctl_unpin(struct drm_device *dev, void *data,

ret = nouveau_bo_unpin(nouveau_gem_object(gem));

mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(gem);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(gem);

return ret;
}
Expand Down Expand Up @@ -935,9 +929,7 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
}

out:
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(gem);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(gem);
return ret;
}

Expand Down Expand Up @@ -965,9 +957,7 @@ nouveau_gem_ioctl_cpu_fini(struct drm_device *dev, void *data,
ret = 0;

out:
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(gem);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(gem);
return ret;
}

Expand All @@ -986,9 +976,7 @@ nouveau_gem_ioctl_info(struct drm_device *dev, void *data,
return -EINVAL;

ret = nouveau_gem_info(gem, req);
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(gem);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(gem);
return ret;
}

9 changes: 3 additions & 6 deletions drivers/gpu/drm/nouveau/nouveau_notifier.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,8 @@ nouveau_notifier_init_channel(struct nouveau_channel *chan)

chan->notifier_bo = ntfy;
out_err:
if (ret) {
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(ntfy->gem);
mutex_unlock(&dev->struct_mutex);
}
if (ret)
drm_gem_object_unreference_unlocked(ntfy->gem);

return ret;
}
Expand All @@ -81,8 +78,8 @@ nouveau_notifier_takedown_channel(struct nouveau_channel *chan)
nouveau_bo_unmap(chan->notifier_bo);
mutex_lock(&dev->struct_mutex);
nouveau_bo_unpin(chan->notifier_bo);
drm_gem_object_unreference(chan->notifier_bo->gem);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(chan->notifier_bo->gem);
nouveau_mem_takedown(&chan->notifier_heap);
}

Expand Down
4 changes: 1 addition & 3 deletions drivers/gpu/drm/nouveau/nv04_crtc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,9 +926,7 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);
nv_crtc->cursor.show(nv_crtc, true);
out:
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(gem);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(gem);
return ret;
}

Expand Down
4 changes: 1 addition & 3 deletions drivers/gpu/drm/nouveau/nv50_crtc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,7 @@ nv50_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
nv_crtc->cursor.show(nv_crtc, true);

out:
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(gem);
mutex_unlock(&dev->struct_mutex);
drm_gem_object_unreference_unlocked(gem);
return ret;
}

Expand Down
7 changes: 2 additions & 5 deletions drivers/gpu/drm/radeon/radeon_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,8 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error)
radeon_bo_list_unreserve(&parser->validated);
}
for (i = 0; i < parser->nrelocs; i++) {
if (parser->relocs[i].gobj) {
mutex_lock(&parser->rdev->ddev->struct_mutex);
drm_gem_object_unreference(parser->relocs[i].gobj);
mutex_unlock(&parser->rdev->ddev->struct_mutex);
}
if (parser->relocs[i].gobj)
drm_gem_object_unreference_unlocked(parser->relocs[i].gobj);
}
kfree(parser->track);
kfree(parser->relocs);
Expand Down
8 changes: 2 additions & 6 deletions drivers/gpu/drm/radeon/radeon_cursor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,13 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc,
unpin:
if (radeon_crtc->cursor_bo) {
radeon_gem_object_unpin(radeon_crtc->cursor_bo);
mutex_lock(&crtc->dev->struct_mutex);
drm_gem_object_unreference(radeon_crtc->cursor_bo);
mutex_unlock(&crtc->dev->struct_mutex);
drm_gem_object_unreference_unlocked(radeon_crtc->cursor_bo);
}

radeon_crtc->cursor_bo = obj;
return 0;
fail:
mutex_lock(&crtc->dev->struct_mutex);
drm_gem_object_unreference(obj);
mutex_unlock(&crtc->dev->struct_mutex);
drm_gem_object_unreference_unlocked(obj);

return 0;
}
Expand Down
7 changes: 2 additions & 5 deletions drivers/gpu/drm/radeon/radeon_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,11 +679,8 @@ static void radeon_user_framebuffer_destroy(struct drm_framebuffer *fb)
if (fb->fbdev)
radeonfb_remove(dev, fb);

if (radeon_fb->obj) {
mutex_lock(&dev->struct_mutex);
drm_gem_object_unreference(radeon_fb->obj);
mutex_unlock(&dev->struct_mutex);
}
if (radeon_fb->obj)
drm_gem_object_unreference_unlocked(radeon_fb->obj);
drm_framebuffer_cleanup(fb);
kfree(radeon_fb);
}
Expand Down
Loading

0 comments on commit bc9025b

Please sign in to comment.