Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2012 04:24:25 +0000 (20:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2012 04:24:25 +0000 (20:24 -0800)
Pull drm bugfix from Dave Airlie:
 "Just a single urgent regression fix, seeing a few wierd behaviours I'd
  like not to persist."

* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
  drm/ttm: fix delayed ttm_bo_cleanup_refs_and_unlock delayed handling

drivers/gpu/drm/ttm/ttm_bo.c

index a9151337d5b916dfd5126d5a81b83c1e363448f8..33d20be87db5f4e6070a5c20fe114816b88e7efe 100644 (file)
@@ -579,7 +579,7 @@ static int ttm_bo_cleanup_refs_and_unlock(struct ttm_buffer_object *bo,
                 * at this point the buffer should be dead, so
                 * no new sync objects can be attached.
                 */
-               sync_obj = driver->sync_obj_ref(&bo->sync_obj);
+               sync_obj = driver->sync_obj_ref(bo->sync_obj);
                spin_unlock(&bdev->fence_lock);
 
                atomic_set(&bo->reserved, 0);