diff options
author | Dave Airlie <airlied@redhat.com> | 2020-09-15 04:34:51 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-09-16 02:35:30 +0300 |
commit | 9e9a153bdf2555a931fd37678a8e44d170a5d943 (patch) | |
tree | 1da6cf699fc948cec069a258edaa55020489e4bb /drivers/gpu/drm/ttm | |
parent | 2040ec970e94dde0b94e200ae9bb8f21a61c928f (diff) | |
download | linux-9e9a153bdf2555a931fd37678a8e44d170a5d943.tar.xz |
drm/ttm: move ttm binding/unbinding out of ttm_tt paths.
Move these up to the bo level, moving ttm_tt to just being
backing store. Next step is to move the bound flag out.
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200915024007.67163-6-airlied@gmail.com
Diffstat (limited to 'drivers/gpu/drm/ttm')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 31 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_util.c | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 31 |
3 files changed, 32 insertions, 35 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 654384c7aae1..17010e7d0ea9 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -264,7 +264,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, if (ret) goto out_err; - ret = ttm_tt_bind(bdev, bo->ttm, mem); + ret = ttm_bo_tt_bind(bo, mem); if (ret) goto out_err; } @@ -1619,6 +1619,35 @@ void ttm_bo_tt_destroy(struct ttm_buffer_object *bo) { if (bo->ttm == NULL) return; + + ttm_bo_tt_unbind(bo); ttm_tt_destroy(bo->bdev, bo->ttm); bo->ttm = NULL; } + +int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem) +{ + int ret; + + if (!bo->ttm) + return -EINVAL; + + if (ttm_bo_tt_is_bound(bo)) + return 0; + + ret = bo->bdev->driver->ttm_tt_bind(bo->bdev, bo->ttm, mem); + if (unlikely(ret != 0)) + return ret; + + ttm_bo_tt_set_bound(bo); + return 0; +} +EXPORT_SYMBOL(ttm_bo_tt_bind); + +void ttm_bo_tt_unbind(struct ttm_buffer_object *bo) +{ + if (ttm_bo_tt_is_bound(bo)) { + bo->bdev->driver->ttm_tt_unbind(bo->bdev, bo->ttm); + ttm_bo_tt_set_unbound(bo); + } +} diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 2ce97760a089..d6634a5caba2 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -67,7 +67,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, return ret; } - ttm_tt_unbind(bo->bdev, ttm); + ttm_bo_tt_unbind(bo); ttm_bo_free_old_node(bo); old_mem->mem_type = TTM_PL_SYSTEM; } @@ -82,7 +82,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, if (unlikely(ret != 0)) return ret; - ret = ttm_tt_bind(bo->bdev, ttm, new_mem); + ret = ttm_bo_tt_bind(bo, new_mem); if (unlikely(ret != 0)) return ret; } @@ -701,4 +701,3 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) return 0; } - diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 93d65e5e4205..a4f0296effac 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -209,8 +209,6 @@ EXPORT_SYMBOL(ttm_tt_set_placement_caching); void ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *ttm) { - ttm_tt_unbind(bdev, ttm); - ttm_tt_unpopulate(bdev, ttm); if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP) && @@ -303,35 +301,6 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma) } EXPORT_SYMBOL(ttm_dma_tt_fini); -void ttm_tt_unbind(struct ttm_bo_device *bdev, struct ttm_tt *ttm) -{ - if (ttm_tt_is_bound(ttm)) { - bdev->driver->ttm_tt_unbind(bdev, ttm); - ttm_tt_set_unbound(ttm); - } -} - -int ttm_tt_bind(struct ttm_bo_device *bdev, - struct ttm_tt *ttm, struct ttm_resource *bo_mem) -{ - int ret = 0; - - if (!ttm) - return -EINVAL; - - if (ttm_tt_is_bound(ttm)) - return 0; - - ret = bdev->driver->ttm_tt_bind(bdev, ttm, bo_mem); - if (unlikely(ret != 0)) - return ret; - - ttm_tt_set_bound(ttm); - - return 0; -} -EXPORT_SYMBOL(ttm_tt_bind); - int ttm_tt_swapin(struct ttm_tt *ttm) { struct address_space *swap_space; |