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

drm/nouveau: clean up nouveau_bo_move_ntfy

Browse Source 
Just another leftover from a TTM cleanup.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210315191432.153826-2-christian.koenig@amd.com
This commit is contained in:
Christian König 2021-02-11 12:35:23 +01:00
parent f1c68b6a32
commit 5ea143c38e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -886,9 +886,8 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
NV_INFO(drm, "MM: using %s for buffer copies\n", name);
}
static void
nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict,
struct ttm_resource *new_reg)
static void nouveau_bo_move_ntfy(struct ttm_buffer_object *bo,
struct ttm_resource *new_reg)
{
struct nouveau_mem *mem = new_reg ? nouveau_mem(new_reg) : NULL;
struct nouveau_bo *nvbo = nouveau_bo(bo);
@ -974,7 +973,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
return ret;
}
nouveau_bo_move_ntfy(bo, evict, new_reg);
nouveau_bo_move_ntfy(bo, new_reg);
ret = ttm_bo_wait_ctx(bo, ctx);
if (ret)
goto out_ntfy;
@ -1039,9 +1038,7 @@ out:
}
out_ntfy:
if (ret) {
swap(*new_reg, bo->mem);
nouveau_bo_move_ntfy(bo, false, new_reg);
swap(*new_reg, bo->mem);
nouveau_bo_move_ntfy(bo, &bo->mem);
}
return ret;
}
@ -1315,7 +1312,7 @@ nouveau_bo_fence(struct nouveau_bo *nvbo, struct nouveau_fence *fence, bool excl
static void
nouveau_bo_delete_mem_notify(struct ttm_buffer_object *bo)
{
nouveau_bo_move_ntfy(bo, false, NULL);
nouveau_bo_move_ntfy(bo, NULL);
}
struct ttm_device_funcs nouveau_bo_driver = {