diff options
| author | Christian König <christian.koenig@amd.com> | 2020-10-06 16:30:09 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2021-03-24 17:05:14 +0100 |
| commit | f9e2a03e110ad0c78e69201f59d18dc1c487efac (patch) | |
| tree | 998a853fcd30691efbdbdfa92cbe351210f29fbf /include/drm | |
| parent | ebd59851c796c221daf0d3b594fb2533f87161cf (diff) | |
| download | linux-stable-f9e2a03e110ad0c78e69201f59d18dc1c487efac.tar.gz linux-stable-f9e2a03e110ad0c78e69201f59d18dc1c487efac.tar.bz2 linux-stable-f9e2a03e110ad0c78e69201f59d18dc1c487efac.zip | |
drm/ttm: remove swap LRU v3
Instead evict round robin from each devices SYSTEM and TT domain.
v2: reorder num_pages access reported by Dan's script
v3: fix rebase fallout, num_pages should be 32bit
Signed-off-by: Christian König <christian.koenig@amd.com>
Tested-by: Nirmoy Das <nirmoy.das@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/424009/
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 1 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 1 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_device.h | 7 |
3 files changed, 2 insertions, 7 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 5044ac330858..3587f660e8f4 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -144,7 +144,6 @@ struct ttm_buffer_object { struct list_head lru; struct list_head ddestroy; - struct list_head swap; /** * Members protected by a bo reservation. diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 8959c0075cfd..d007feef7676 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -69,7 +69,6 @@ struct ttm_lru_bulk_move_pos { struct ttm_lru_bulk_move { struct ttm_lru_bulk_move_pos tt[TTM_MAX_BO_PRIORITY]; struct ttm_lru_bulk_move_pos vram[TTM_MAX_BO_PRIORITY]; - struct ttm_lru_bulk_move_pos swap[TTM_MAX_BO_PRIORITY]; }; /* diff --git a/include/drm/ttm/ttm_device.h b/include/drm/ttm/ttm_device.h index ee6bba7fab6f..93f3b59755ac 100644 --- a/include/drm/ttm/ttm_device.h +++ b/include/drm/ttm/ttm_device.h @@ -64,11 +64,6 @@ extern struct ttm_global { struct list_head device_list; /** - * Protected by the lru_lock. - */ - struct list_head swap_lru[TTM_MAX_BO_PRIORITY]; - - /** * Internal protection. */ atomic_t bo_count; @@ -298,6 +293,8 @@ struct ttm_device { }; int ttm_global_swapout(struct ttm_operation_ctx *ctx, gfp_t gfp_flags); +int ttm_device_swapout(struct ttm_device *bdev, struct ttm_operation_ctx *ctx, + gfp_t gfp_flags); static inline struct ttm_resource_manager * ttm_manager_type(struct ttm_device *bdev, int mem_type) |