Commit 4499f2ac authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher

drm/ttm: Remove unused parameter evict from ttm_bo_move_memcpy

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4e2f0caa
...@@ -436,8 +436,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, ...@@ -436,8 +436,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo,
if (r) { if (r) {
memcpy: memcpy:
r = ttm_bo_move_memcpy(bo, evict, interruptible, r = ttm_bo_move_memcpy(bo, interruptible, no_wait_gpu, new_mem);
no_wait_gpu, new_mem);
if (r) { if (r) {
return r; return r;
} }
......
...@@ -1297,7 +1297,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr, ...@@ -1297,7 +1297,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,
/* Fallback to software copy. */ /* Fallback to software copy. */
ret = ttm_bo_wait(bo, intr, no_wait_gpu); ret = ttm_bo_wait(bo, intr, no_wait_gpu);
if (ret == 0) if (ret == 0)
ret = ttm_bo_move_memcpy(bo, evict, intr, no_wait_gpu, new_mem); ret = ttm_bo_move_memcpy(bo, intr, no_wait_gpu, new_mem);
out: out:
if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) { if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) {
......
...@@ -361,8 +361,8 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, ...@@ -361,8 +361,8 @@ static int qxl_bo_move(struct ttm_buffer_object *bo,
qxl_move_null(bo, new_mem); qxl_move_null(bo, new_mem);
return 0; return 0;
} }
return ttm_bo_move_memcpy(bo, evict, interruptible, return ttm_bo_move_memcpy(bo, interruptible, no_wait_gpu,
no_wait_gpu, new_mem); new_mem);
} }
static void qxl_bo_move_notify(struct ttm_buffer_object *bo, static void qxl_bo_move_notify(struct ttm_buffer_object *bo,
......
...@@ -444,8 +444,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, ...@@ -444,8 +444,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
if (r) { if (r) {
memcpy: memcpy:
r = ttm_bo_move_memcpy(bo, evict, interruptible, r = ttm_bo_move_memcpy(bo, interruptible, no_wait_gpu, new_mem);
no_wait_gpu, new_mem);
if (r) { if (r) {
return r; return r;
} }
......
...@@ -359,8 +359,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, ...@@ -359,8 +359,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
ret = bdev->driver->move(bo, evict, interruptible, ret = bdev->driver->move(bo, evict, interruptible,
no_wait_gpu, mem); no_wait_gpu, mem);
else else
ret = ttm_bo_move_memcpy(bo, evict, interruptible, ret = ttm_bo_move_memcpy(bo, interruptible, no_wait_gpu, mem);
no_wait_gpu, mem);
if (ret) { if (ret) {
if (bdev->driver->move_notify) { if (bdev->driver->move_notify) {
......
...@@ -329,8 +329,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst, ...@@ -329,8 +329,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst,
} }
int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
bool evict, bool interruptible, bool interruptible, bool no_wait_gpu,
bool no_wait_gpu,
struct ttm_mem_reg *new_mem) struct ttm_mem_reg *new_mem)
{ {
struct ttm_bo_device *bdev = bo->bdev; struct ttm_bo_device *bdev = bo->bdev;
......
...@@ -983,7 +983,6 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo, ...@@ -983,7 +983,6 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
* ttm_bo_move_memcpy * ttm_bo_move_memcpy
* *
* @bo: A pointer to a struct ttm_buffer_object. * @bo: A pointer to a struct ttm_buffer_object.
* @evict: 1: This is an eviction. Don't try to pipeline.
* @interruptible: Sleep interruptible if waiting. * @interruptible: Sleep interruptible if waiting.
* @no_wait_gpu: Return immediately if the GPU is busy. * @no_wait_gpu: Return immediately if the GPU is busy.
* @new_mem: struct ttm_mem_reg indicating where to move. * @new_mem: struct ttm_mem_reg indicating where to move.
...@@ -999,8 +998,7 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo, ...@@ -999,8 +998,7 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
*/ */
extern int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, extern int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
bool evict, bool interruptible, bool interruptible, bool no_wait_gpu,
bool no_wait_gpu,
struct ttm_mem_reg *new_mem); struct ttm_mem_reg *new_mem);
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment