lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/ttm: remove sync_obj_arg from ttm_bo_move_accel_cleanup

Browse Source 
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-By: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Maarten Lankhorst
2012-10-12 15:03:11 +00:00
committed by Dave Airlie
parent 5fb4ef0e36
commit b03640b1de
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@@ -566,7 +566,7 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
if (ret) if (ret)
return ret; return ret;
ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, evict, ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, evict,
no_wait_reserve, no_wait_gpu, new_mem); no_wait_reserve, no_wait_gpu, new_mem);
nouveau_fence_unref(&fence); nouveau_fence_unref(&fence);
return ret; return ret;

2
drivers/gpu/drm/radeon/radeon_ttm.c
View File

@@ -265,7 +265,7 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
new_mem->num_pages * (PAGE_SIZE / RADEON_GPU_PAGE_SIZE), /* GPU pages */ new_mem->num_pages * (PAGE_SIZE / RADEON_GPU_PAGE_SIZE), /* GPU pages */
&fence); &fence);
/* FIXME: handle copy error */ /* FIXME: handle copy error */
r = ttm_bo_move_accel_cleanup(bo, (void *)fence, NULL, r = ttm_bo_move_accel_cleanup(bo, (void *)fence,
evict, no_wait_reserve, no_wait_gpu, new_mem); evict, no_wait_reserve, no_wait_gpu, new_mem);
radeon_fence_unref(&fence); radeon_fence_unref(&fence);
return r; return r;

1
drivers/gpu/drm/ttm/ttm_bo_util.c
View File

@@ -611,7 +611,6 @@ EXPORT_SYMBOL(ttm_bo_kunmap);
int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
void *sync_obj, void *sync_obj,
void *sync_obj_arg,
bool evict, bool no_wait_reserve, bool evict, bool no_wait_reserve,
bool no_wait_gpu, bool no_wait_gpu,
struct ttm_mem_reg *new_mem) struct ttm_mem_reg *new_mem)

3
include/drm/ttm/ttm_bo_driver.h
View File

@@ -970,8 +970,6 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
* *
* @bo: A pointer to a struct ttm_buffer_object. * @bo: A pointer to a struct ttm_buffer_object.
* @sync_obj: A sync object that signals when moving is complete. * @sync_obj: A sync object that signals when moving is complete.
* @sync_obj_arg: An argument to pass to the sync object idle / wait
* functions.
* @evict: This is an evict move. Don't return until the buffer is idle. * @evict: This is an evict move. Don't return until the buffer is idle.
* @no_wait_reserve: Return immediately if other buffers are busy. * @no_wait_reserve: Return immediately if other buffers are busy.
* @no_wait_gpu: Return immediately if the GPU is busy. * @no_wait_gpu: Return immediately if the GPU is busy.
@@ -987,7 +985,6 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
void *sync_obj, void *sync_obj,
void *sync_obj_arg,
bool evict, bool no_wait_reserve, bool evict, bool no_wait_reserve,
bool no_wait_gpu, bool no_wait_gpu,
struct ttm_mem_reg *new_mem); struct ttm_mem_reg *new_mem);