Merge remote branch 'korg/drm-core-next' into drm-next-stage
Dave Airlie [Mon, 1 Mar 2010 05:40:12 +0000 (15:40 +1000)]
* korg/drm-core-next:
  drm/ttm: handle OOM in ttm_tt_swapout
  drm/radeon/kms/atom: fix shr/shl ops
  drm/kms: fix spelling of "CLOCK"
  drm/kms: fix fb_changed = true else statement
  drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi()
  drm: switch all GEM/KMS ioctls to unlocked ioctl status.
  Use drm_gem_object_[handle_]unreference_unlocked where possible
  drm: introduce drm_gem_object_[handle_]unreference_unlocked

1  2 
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/atom.c
drivers/gpu/drm/radeon/radeon_cs.c
drivers/gpu/drm/ttm/ttm_tt.c

Simple merge
Simple merge
Simple merge
@@@ -189,16 -189,15 +189,13 @@@ static void radeon_cs_parser_fini(struc
  {
        unsigned i;
  
 -      if (error && parser->ib) {
 -              radeon_bo_list_unvalidate(&parser->validated,
 -                                              parser->ib->fence);
 -      } else {
 -              radeon_bo_list_unreserve(&parser->validated);
 +      if (!error && parser->ib) {
 +              radeon_bo_list_fence(&parser->validated, parser->ib->fence);
        }
 +      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);
Simple merge