leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/ttm: drop glob parameter from ttm_bo_swapout

Browse Source 
We can always access the global state.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/393499/
This commit is contained in:
Christian König
2020-10-01 16:17:55 +02:00
parent 4ce032d64c
commit 4561b366c7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/ttm/ttm_bo.c
View File

@@ -1432,8 +1432,9 @@ EXPORT_SYMBOL(ttm_bo_wait);
* A buffer object shrink method that tries to swap out the first * A buffer object shrink method that tries to swap out the first
* buffer object on the bo_global::swap_lru list. * buffer object on the bo_global::swap_lru list.
*/ */
int ttm_bo_swapout(struct ttm_bo_global *glob, struct ttm_operation_ctx *ctx) int ttm_bo_swapout(struct ttm_operation_ctx *ctx)
{ {
struct ttm_bo_global *glob = &ttm_bo_glob;
struct ttm_buffer_object *bo; struct ttm_buffer_object *bo;
int ret = -EBUSY; int ret = -EBUSY;
bool locked; bool locked;
@@ -1531,7 +1532,7 @@ void ttm_bo_swapout_all(void)
.no_wait_gpu = false .no_wait_gpu = false
}; };
while (ttm_bo_swapout(&ttm_bo_glob, &ctx) == 0); while (ttm_bo_swapout(&ctx) == 0);
} }
EXPORT_SYMBOL(ttm_bo_swapout_all); EXPORT_SYMBOL(ttm_bo_swapout_all);

2
drivers/gpu/drm/ttm/ttm_memory.c
View File

@@ -275,7 +275,7 @@ static void ttm_shrink(struct ttm_mem_global *glob, bool from_wq,
while (ttm_zones_above_swap_target(glob, from_wq, extra)) { while (ttm_zones_above_swap_target(glob, from_wq, extra)) {
spin_unlock(&glob->lock); spin_unlock(&glob->lock);
ret = ttm_bo_swapout(&ttm_bo_glob, ctx); ret = ttm_bo_swapout(ctx);
spin_lock(&glob->lock); spin_lock(&glob->lock);
if (unlikely(ret != 0)) if (unlikely(ret != 0))
break; break;

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

@@ -541,8 +541,7 @@ ssize_t ttm_bo_io(struct ttm_bo_device *bdev, struct file *filp,
const char __user *wbuf, char __user *rbuf, const char __user *wbuf, char __user *rbuf,
size_t count, loff_t *f_pos, bool write); size_t count, loff_t *f_pos, bool write);
int ttm_bo_swapout(struct ttm_bo_global *glob, int ttm_bo_swapout(struct ttm_operation_ctx *ctx);
struct ttm_operation_ctx *ctx);
void ttm_bo_swapout_all(void); void ttm_bo_swapout_all(void);
/** /**