summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-20 05:24:25 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-20 05:24:25 +0100
commitdcd6a97d1d821335051cbf35b1e2be54955d6276 (patch)
treecd728632a7aac4d1df44b6de7dcb76bba3a78090 /drivers
parentMerge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentdrm/ttm: fix delayed ttm_bo_cleanup_refs_and_unlock delayed handling (diff)
downloadlinux-dcd6a97d1d821335051cbf35b1e2be54955d6276.tar.xz
linux-dcd6a97d1d821335051cbf35b1e2be54955d6276.zip
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index a9151337d5b9..33d20be87db5 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -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);