aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/ttm/ttm_bo.c
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2012-10-12 11:04:00 -0400
committerDave Airlie <airlied@redhat.com>2012-11-20 01:10:10 -0500
commitdedfdffd448aea2543b59fd504b92b8212ab3b7d (patch)
tree0a564865acb120e412e5718742ca7a6a481de98a /drivers/gpu/drm/ttm/ttm_bo.c
parentb03640b1de2eb349c2453d060d0bd0b0486e29b8 (diff)
drm/ttm: remove sync_arg from driver functions
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Reviewed-By: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo.c')
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 4cb3f493da76..d1e5326d442c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -543,7 +543,7 @@ queue:
543 spin_unlock(&bdev->fence_lock); 543 spin_unlock(&bdev->fence_lock);
544 544
545 if (sync_obj) { 545 if (sync_obj) {
546 driver->sync_obj_flush(sync_obj, NULL); 546 driver->sync_obj_flush(sync_obj);
547 driver->sync_obj_unref(&sync_obj); 547 driver->sync_obj_unref(&sync_obj);
548 } 548 }
549 schedule_delayed_work(&bdev->wq, 549 schedule_delayed_work(&bdev->wq,
@@ -1721,7 +1721,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo,
1721 1721
1722 while (bo->sync_obj) { 1722 while (bo->sync_obj) {
1723 1723
1724 if (driver->sync_obj_signaled(bo->sync_obj, NULL)) { 1724 if (driver->sync_obj_signaled(bo->sync_obj)) {
1725 void *tmp_obj = bo->sync_obj; 1725 void *tmp_obj = bo->sync_obj;
1726 bo->sync_obj = NULL; 1726 bo->sync_obj = NULL;
1727 clear_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags); 1727 clear_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags);
@@ -1736,7 +1736,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo,
1736 1736
1737 sync_obj = driver->sync_obj_ref(bo->sync_obj); 1737 sync_obj = driver->sync_obj_ref(bo->sync_obj);
1738 spin_unlock(&bdev->fence_lock); 1738 spin_unlock(&bdev->fence_lock);
1739 ret = driver->sync_obj_wait(sync_obj, NULL, 1739 ret = driver->sync_obj_wait(sync_obj,
1740 lazy, interruptible); 1740 lazy, interruptible);
1741 if (unlikely(ret != 0)) { 1741 if (unlikely(ret != 0)) {
1742 driver->sync_obj_unref(&sync_obj); 1742 driver->sync_obj_unref(&sync_obj);