diff options
| author | Dave Airlie | 2020-09-23 10:25:08 +1000 |
|---|---|---|
| committer | Dave Airlie | 2020-10-19 15:17:22 +1000 |
| commit | d1934d2b687ae0c27c69c4dd7d74f65a8ce5083d (patch) | |
| tree | 247017c2371dd2657eba0f5dc272b4703e3e2d1e | |
| parent | 5fefd25047bd443fd79a97c3e429c7de88d5c55d (diff) | |
drm/ttm: drop free old node wrapper.
This isn't really used anymore, if drivers needs it later,
just add back an inline wrapper.
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/20200924051845.397177-13-airlied@gmail.com
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 11 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 9 |
2 files changed, 3 insertions, 17 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index ba7ab5ed85d0..ed1114235b66 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -45,11 +45,6 @@ struct ttm_transfer_obj { struct ttm_buffer_object *bo; }; -void ttm_bo_free_old_node(struct ttm_buffer_object *bo) -{ - ttm_resource_free(bo, &bo->mem); -} - int ttm_bo_move_ttm(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, struct ttm_resource *new_mem) @@ -68,7 +63,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, } ttm_bo_tt_unbind(bo); - ttm_bo_free_old_node(bo); + ttm_resource_free(bo, &bo->mem); old_mem->mem_type = TTM_PL_SYSTEM; } @@ -537,7 +532,7 @@ static int ttm_bo_wait_free_node(struct ttm_buffer_object *bo, if (!dst_use_tt) ttm_bo_tt_destroy(bo); - ttm_bo_free_old_node(bo); + ttm_resource_free(bo, &bo->mem); return 0; } @@ -598,7 +593,7 @@ static void ttm_bo_move_pipeline_evict(struct ttm_buffer_object *bo, } spin_unlock(&from->move_lock); - ttm_bo_free_old_node(bo); + ttm_resource_free(bo, &bo->mem); dma_fence_put(bo->moving); bo->moving = dma_fence_get(fence); diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index f29419cb7980..3dbc11eb6787 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -616,15 +616,6 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, struct ttm_resource *new_mem); /** - * ttm_bo_free_old_node - * - * @bo: A pointer to a struct ttm_buffer_object. - * - * Utility function to free an old placement after a successful move. - */ -void ttm_bo_free_old_node(struct ttm_buffer_object *bo); - -/** * ttm_bo_move_accel_cleanup. * * @bo: A pointer to a struct ttm_buffer_object. |