aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2012-10-12 11:03:11 -0400
committerDave Airlie <airlied@redhat.com>2012-11-20 01:10:02 -0500
commitb03640b1de2eb349c2453d060d0bd0b0486e29b8 (patch)
tree87e84dbc9495a2cd0385af12a6fa171f7711f16a /drivers/gpu/drm
parent5fb4ef0e36b4c6ecc7fb025aaacb3b63b1114e87 (diff)
drm/ttm: remove sync_obj_arg from ttm_bo_move_accel_cleanup
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')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bo.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_ttm.c2
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo_util.c1
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 3cbf1a8cf551..6a2592f7daae 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -566,7 +566,7 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
566 if (ret) 566 if (ret)
567 return ret; 567 return ret;
568 568
569 ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, evict, 569 ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, evict,
570 no_wait_reserve, no_wait_gpu, new_mem); 570 no_wait_reserve, no_wait_gpu, new_mem);
571 nouveau_fence_unref(&fence); 571 nouveau_fence_unref(&fence);
572 return ret; 572 return ret;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 5ebe1b3e5db2..929be87204da 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -265,7 +265,7 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
265 new_mem->num_pages * (PAGE_SIZE / RADEON_GPU_PAGE_SIZE), /* GPU pages */ 265 new_mem->num_pages * (PAGE_SIZE / RADEON_GPU_PAGE_SIZE), /* GPU pages */
266 &fence); 266 &fence);
267 /* FIXME: handle copy error */ 267 /* FIXME: handle copy error */
268 r = ttm_bo_move_accel_cleanup(bo, (void *)fence, NULL, 268 r = ttm_bo_move_accel_cleanup(bo, (void *)fence,
269 evict, no_wait_reserve, no_wait_gpu, new_mem); 269 evict, no_wait_reserve, no_wait_gpu, new_mem);
270 radeon_fence_unref(&fence); 270 radeon_fence_unref(&fence);
271 return r; 271 return r;
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 81c74f53ce4f..b9c4e515b1d8 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -611,7 +611,6 @@ EXPORT_SYMBOL(ttm_bo_kunmap);
611 611
612int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, 612int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
613 void *sync_obj, 613 void *sync_obj,
614 void *sync_obj_arg,
615 bool evict, bool no_wait_reserve, 614 bool evict, bool no_wait_reserve,
616 bool no_wait_gpu, 615 bool no_wait_gpu,
617 struct ttm_mem_reg *new_mem) 616 struct ttm_mem_reg *new_mem)