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

drm/ttm: split populate out from binding.

Browse Source 
Drivers have to call populate themselves now before binding.

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-5-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-09-15 11:16:53 +10:00
parent 395a73f8ba
commit 2040ec970e
7 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
View File

@ -547,8 +547,12 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
goto out_cleanup; goto out_cleanup;
} }
r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
if (unlikely(r))
goto out_cleanup;
/* Bind the memory to the GTT space */ /* Bind the memory to the GTT space */
r = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem, ctx); r = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem);
if (unlikely(r)) { if (unlikely(r)) {
goto out_cleanup; goto out_cleanup;
} }

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

@ -920,7 +920,11 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
if (ret) if (ret)
return ret; return ret;
ret = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg, &ctx); ret = ttm_tt_populate(bo->bdev, bo->ttm, &ctx);
if (ret)
goto out;
ret = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg);
if (ret) if (ret)
goto out; goto out;

7
drivers/gpu/drm/radeon/radeon_ttm.c
View File

@ -233,7 +233,12 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
goto out_cleanup; goto out_cleanup;
} }
r = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem, &ctx); r = ttm_tt_populate(bo->bdev, bo->ttm, &ctx);
if (unlikely(r)) {
goto out_cleanup;
}
r = ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem);
if (unlikely(r)) { if (unlikely(r)) {
goto out_cleanup; goto out_cleanup;
} }

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

@ -260,7 +260,11 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
goto out_err; goto out_err;
if (mem->mem_type != TTM_PL_SYSTEM) { if (mem->mem_type != TTM_PL_SYSTEM) {
ret = ttm_tt_bind(bdev, bo->ttm, mem, ctx); ret = ttm_tt_populate(bdev, bo->ttm, ctx);
if (ret)
goto out_err;
ret = ttm_tt_bind(bdev, bo->ttm, mem);
if (ret) if (ret)
goto out_err; goto out_err;
} }

7
drivers/gpu/drm/ttm/ttm_bo_util.c
View File

@ -77,7 +77,12 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
return ret; return ret;
if (new_mem->mem_type != TTM_PL_SYSTEM) { if (new_mem->mem_type != TTM_PL_SYSTEM) {
ret = ttm_tt_bind(bo->bdev, ttm, new_mem, ctx);
ret = ttm_tt_populate(bo->bdev, ttm, ctx);
if (unlikely(ret != 0))
return ret;
ret = ttm_tt_bind(bo->bdev, ttm, new_mem);
if (unlikely(ret != 0)) if (unlikely(ret != 0))
return ret; return ret;
} }

11
drivers/gpu/drm/ttm/ttm_tt.c
View File

@ -312,8 +312,7 @@ void ttm_tt_unbind(struct ttm_bo_device *bdev, struct ttm_tt *ttm)
} }
int ttm_tt_bind(struct ttm_bo_device *bdev, int ttm_tt_bind(struct ttm_bo_device *bdev,
struct ttm_tt *ttm, struct ttm_resource *bo_mem, struct ttm_tt *ttm, struct ttm_resource *bo_mem)
struct ttm_operation_ctx *ctx)
{ {
int ret = 0; int ret = 0;
@ -323,10 +322,6 @@ int ttm_tt_bind(struct ttm_bo_device *bdev,
if (ttm_tt_is_bound(ttm)) if (ttm_tt_is_bound(ttm))
return 0; return 0;
ret = ttm_tt_populate(bdev, ttm, ctx);
if (ret)
return ret;
ret = bdev->driver->ttm_tt_bind(bdev, ttm, bo_mem); ret = bdev->driver->ttm_tt_bind(bdev, ttm, bo_mem);
if (unlikely(ret != 0)) if (unlikely(ret != 0))
return ret; return ret;
@ -455,6 +450,9 @@ int ttm_tt_populate(struct ttm_bo_device *bdev,
{ {
int ret; int ret;
if (!ttm)
return -EINVAL;
if (ttm_tt_is_populated(ttm)) if (ttm_tt_is_populated(ttm))
return 0; return 0;
@ -466,6 +464,7 @@ int ttm_tt_populate(struct ttm_bo_device *bdev,
ttm_tt_add_mapping(bdev, ttm); ttm_tt_add_mapping(bdev, ttm);
return ret; return ret;
} }
EXPORT_SYMBOL(ttm_tt_populate);
static void ttm_tt_clear_mapping(struct ttm_tt *ttm) static void ttm_tt_clear_mapping(struct ttm_tt *ttm)
{ {

3
include/drm/ttm/ttm_tt.h
View File

@ -173,8 +173,7 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma);
* Bind the pages of @ttm to an aperture location identified by @bo_mem * Bind the pages of @ttm to an aperture location identified by @bo_mem
*/ */
int ttm_tt_bind(struct ttm_bo_device *bdev, int ttm_tt_bind(struct ttm_bo_device *bdev,
struct ttm_tt *ttm, struct ttm_resource *bo_mem, struct ttm_tt *ttm, struct ttm_resource *bo_mem);
struct ttm_operation_ctx *ctx);
/** /**
* ttm_ttm_destroy: * ttm_ttm_destroy: