UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/ttm: pass man around instead of mem_type in some places 

This makes it easier to cleanup things

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-25-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-08-04 12:55:57 +10:00
parent 98399abd52
commit a006a3ce8e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -769,13 +769,12 @@ static int ttm_mem_evict_wait_busy(struct ttm_buffer_object *busy_bo,
} }
static int ttm_mem_evict_first(struct ttm_bo_device *bdev, static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
uint32_t mem_type, struct ttm_mem_type_manager *man,
const struct ttm_place *place, const struct ttm_place *place,
struct ttm_operation_ctx *ctx, struct ttm_operation_ctx *ctx,
struct ww_acquire_ctx *ticket) struct ww_acquire_ctx *ticket)
{ {
struct ttm_buffer_object *bo = NULL, *busy_bo = NULL; struct ttm_buffer_object *bo = NULL, *busy_bo = NULL;
struct ttm_mem_type_manager *man = &bdev->man[mem_type];
bool locked = false; bool locked = false;
unsigned i; unsigned i;
int ret; int ret;
@ -922,7 +921,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
break; break;
if (unlikely(ret != -ENOSPC)) if (unlikely(ret != -ENOSPC))
return ret; return ret;
ret = ttm_mem_evict_first(bdev, mem->mem_type, place, ctx, ret = ttm_mem_evict_first(bdev, man, place, ctx,
ticket); ticket);
if (unlikely(ret != 0)) if (unlikely(ret != 0))
return ret; return ret;
@ -1407,14 +1406,13 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
EXPORT_SYMBOL(ttm_bo_create); EXPORT_SYMBOL(ttm_bo_create);
static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev, static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
unsigned mem_type) struct ttm_mem_type_manager *man)
{ {
struct ttm_operation_ctx ctx = { struct ttm_operation_ctx ctx = {
.interruptible = false, .interruptible = false,
.no_wait_gpu = false, .no_wait_gpu = false,
.flags = TTM_OPT_FLAG_FORCE_ALLOC .flags = TTM_OPT_FLAG_FORCE_ALLOC
}; };
struct ttm_mem_type_manager *man = &bdev->man[mem_type];
struct ttm_bo_global *glob = &ttm_bo_glob; struct ttm_bo_global *glob = &ttm_bo_glob;
struct dma_fence *fence; struct dma_fence *fence;
int ret; int ret;
@ -1428,7 +1426,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) { for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {
while (!list_empty(&man->lru[i])) { while (!list_empty(&man->lru[i])) {
spin_unlock(&glob->lru_lock); spin_unlock(&glob->lru_lock);
ret = ttm_mem_evict_first(bdev, mem_type, NULL, &ctx, ret = ttm_mem_evict_first(bdev, man, NULL, &ctx,
NULL); NULL);
if (ret) if (ret)
return ret; return ret;
@ -1473,7 +1471,7 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
ret = 0; ret = 0;
if (mem_type > 0) { if (mem_type > 0) {
ret = ttm_bo_force_list_clean(bdev, mem_type); ret = ttm_bo_force_list_clean(bdev, man);
if (ret) { if (ret) {
pr_err("Cleanup eviction failed\n"); pr_err("Cleanup eviction failed\n");
return ret; return ret;
@ -1503,7 +1501,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
return 0; return 0;
} }
return ttm_bo_force_list_clean(bdev, mem_type); return ttm_bo_force_list_clean(bdev, man);
} }
EXPORT_SYMBOL(ttm_bo_evict_mm); EXPORT_SYMBOL(ttm_bo_evict_mm);