projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
ttm
/
ttm_bo_util.c
diff --git
a/drivers/gpu/drm/ttm/ttm_bo_util.c
b/drivers/gpu/drm/ttm/ttm_bo_util.c
index
f157a9e
..
bf6e216
100644
(file)
--- a/
drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/
drivers/gpu/drm/ttm/ttm_bo_util.c
@@
-45,8
+45,8
@@
void ttm_bo_free_old_node(struct ttm_buffer_object *bo)
}
int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
}
int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
- bool
evict, bool interruptible
,
-
bool no_wait_gpu,
struct ttm_mem_reg *new_mem)
+ bool
interruptible, bool no_wait_gpu
,
+ struct ttm_mem_reg *new_mem)
{
struct ttm_tt *ttm = bo->ttm;
struct ttm_mem_reg *old_mem = &bo->mem;
{
struct ttm_tt *ttm = bo->ttm;
struct ttm_mem_reg *old_mem = &bo->mem;
@@
-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 no_wait_gpu,
+ bool interruptible, bool no_wait_gpu,
struct ttm_mem_reg *new_mem)
{
struct ttm_bo_device *bdev = bo->bdev;
struct ttm_mem_reg *new_mem)
{
struct ttm_bo_device *bdev = bo->bdev;