drm/ttm: drop glob parameter from ttm_bo_swapout

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/

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 6eb151dd840d9999f59ecd9beaf8b8d5334b514d..96adee10857bc09009f57feab59a7195a0ff2f64 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1432,8 +1432,9 @@ EXPORT_SYMBOL(ttm_bo_wait);
  * A buffer object shrink method that tries to swap out the first
  * 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;
        int ret = -EBUSY;
        bool locked;
@@ -1531,7 +1532,7 @@ void ttm_bo_swapout_all(void)
                .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);
 

diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
index 89d50f38c0f2c770825daa340e2ea2b0eef26c7f..69cf622e79e5d06933f8ab18400975ddad1f42e9 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_memory.c
+++ b/drivers/gpu/drm/ttm/ttm_memory.c
@@ -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)) {
                spin_unlock(&glob->lock);
-               ret = ttm_bo_swapout(&ttm_bo_glob, ctx);
+               ret = ttm_bo_swapout(ctx);
                spin_lock(&glob->lock);
                if (unlikely(ret != 0))
                        break;

diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index 6f5ced7d83fed0e49ea0a95a19f57965652bca6f..11c59d6d72d595ffd8f33675c8e07ced4cec512f 100644 (file)
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -541,8 +541,7 @@ ssize_t ttm_bo_io(struct ttm_bo_device *bdev, struct file *filp,
                  const char __user *wbuf, char __user *rbuf,
                  size_t count, loff_t *f_pos, bool write);
 
-int ttm_bo_swapout(struct ttm_bo_global *glob,
-                       struct ttm_operation_ctx *ctx);
+int ttm_bo_swapout(struct ttm_operation_ctx *ctx);
 void ttm_bo_swapout_all(void);
 
 /**