[PATCH 26/45] drm/ttm: remove bind/unbind callbacks.
Christian König
christian.koenig at amd.com
Thu Sep 24 13:32:37 UTC 2020
Am 24.09.20 um 07:18 schrieb Dave Airlie:
> From: Dave Airlie <airlied at redhat.com>
>
> If a driver wants to bind/unbind then it should implement a move
> callback.
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +++--
> drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++---
> drivers/gpu/drm/qxl/qxl_ttm.c | 20 -----------
> drivers/gpu/drm/radeon/radeon_ttm.c | 8 ++---
> drivers/gpu/drm/ttm/ttm_bo.c | 17 ----------
> drivers/gpu/drm/ttm/ttm_bo_util.c | 1 -
> drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 8 +++--
> include/drm/ttm/ttm_bo_driver.h | 39 ----------------------
> 8 files changed, 16 insertions(+), 93 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 50362f56d2d0..a729bdcdd017 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -701,6 +701,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,
> ttm_bo_move_null(bo, new_mem);
> return 0;
> }
> +
> if (old_mem->mem_type == TTM_PL_SYSTEM &&
> new_mem->mem_type == TTM_PL_TT) {
> ttm_bo_move_null(bo, new_mem);
> @@ -709,9 +710,12 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,
>
> if (old_mem->mem_type == TTM_PL_TT &&
> new_mem->mem_type == TTM_PL_SYSTEM) {
> - r = ttm_bo_move_old_to_system(bo, ctx);
> + r = ttm_bo_wait_ctx(bo, ctx);
> if (r)
> return r;
> + amdgpu_ttm_backend_unbind(bo->bdev, bo->ttm);
> + ttm_resource_free(bo, &bo->mem);
> +
> r = ttm_tt_set_placement_caching(bo->ttm, new_mem->placement);
> if (r)
> return r;
> @@ -1740,8 +1744,6 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
> .ttm_tt_create = &amdgpu_ttm_tt_create,
> .ttm_tt_populate = &amdgpu_ttm_tt_populate,
> .ttm_tt_unpopulate = &amdgpu_ttm_tt_unpopulate,
> - .ttm_tt_bind = &amdgpu_ttm_backend_bind,
> - .ttm_tt_unbind = &amdgpu_ttm_backend_unbind,
> .ttm_tt_destroy = &amdgpu_ttm_backend_destroy,
> .eviction_valuable = amdgpu_ttm_bo_eviction_valuable,
> .evict_flags = &amdgpu_evict_flags,
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index fc0f9e9232db..cb2a0f1bf7ff 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -1107,9 +1107,9 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
>
> if (old_reg->mem_type == TTM_PL_TT &&
> new_reg->mem_type == TTM_PL_SYSTEM) {
> - ret = ttm_bo_move_old_to_system(bo, ctx);
> - if (ret)
> - goto out;
> + nouveau_ttm_tt_unbind(bo->bdev, bo->ttm);
> + ttm_resource_free(bo, &bo->mem);
> +
> ret = ttm_tt_set_placement_caching(bo->ttm, new_reg->placement);
> if (ret)
> goto out;
> @@ -1438,8 +1438,6 @@ struct ttm_bo_driver nouveau_bo_driver = {
> .ttm_tt_create = &nouveau_ttm_tt_create,
> .ttm_tt_populate = &nouveau_ttm_tt_populate,
> .ttm_tt_unpopulate = &nouveau_ttm_tt_unpopulate,
> - .ttm_tt_bind = &nouveau_ttm_tt_bind,
> - .ttm_tt_unbind = &nouveau_ttm_tt_unbind,
> .ttm_tt_destroy = &nouveau_ttm_tt_destroy,
> .eviction_valuable = ttm_bo_eviction_valuable,
> .evict_flags = nouveau_bo_evict_flags,
> diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
> index 378b6827b7a3..3bca5f8d8ac5 100644
> --- a/drivers/gpu/drm/qxl/qxl_ttm.c
> +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
> @@ -102,24 +102,6 @@ struct qxl_ttm_tt {
> struct ttm_tt ttm;
> };
>
> -static int qxl_ttm_backend_bind(struct ttm_bo_device *bdev,
> - struct ttm_tt *ttm,
> - struct ttm_resource *bo_mem)
> -{
> - if (!ttm->num_pages) {
> - WARN(1, "nothing to bind %lu pages for mreg %p back %p!\n",
> - ttm->num_pages, bo_mem, ttm);
> - }
> - /* Not implemented */
> - return -1;
> -}
> -
> -static void qxl_ttm_backend_unbind(struct ttm_bo_device *bdev,
> - struct ttm_tt *ttm)
> -{
> - /* Not implemented */
> -}
> -
> static void qxl_ttm_backend_destroy(struct ttm_bo_device *bdev,
> struct ttm_tt *ttm)
> {
> @@ -186,9 +168,7 @@ static void qxl_bo_move_notify(struct ttm_buffer_object *bo,
>
> static struct ttm_bo_driver qxl_bo_driver = {
> .ttm_tt_create = &qxl_ttm_tt_create,
> - .ttm_tt_bind = &qxl_ttm_backend_bind,
> .ttm_tt_destroy = &qxl_ttm_backend_destroy,
> - .ttm_tt_unbind = &qxl_ttm_backend_unbind,
> .eviction_valuable = ttm_bo_eviction_valuable,
> .evict_flags = &qxl_evict_flags,
> .move = &qxl_bo_move,
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 0ea20dc15cb2..496e7b1e14ad 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -354,9 +354,9 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,
>
> if (old_mem->mem_type == TTM_PL_TT &&
> new_mem->mem_type == TTM_PL_SYSTEM) {
> - r = ttm_bo_move_old_to_system(bo, ctx);
> - if (r)
> - return r;
> + radeon_ttm_tt_unbind(bo->bdev, bo->ttm);
> + ttm_resource_free(bo, &bo->mem);
> +
> r = ttm_tt_set_placement_caching(bo->ttm, new_mem->placement);
> if (r)
> return r;
> @@ -835,8 +835,6 @@ static struct ttm_bo_driver radeon_bo_driver = {
> .ttm_tt_create = &radeon_ttm_tt_create,
> .ttm_tt_populate = &radeon_ttm_tt_populate,
> .ttm_tt_unpopulate = &radeon_ttm_tt_unpopulate,
> - .ttm_tt_bind = &radeon_ttm_tt_bind,
> - .ttm_tt_unbind = &radeon_ttm_tt_unbind,
> .ttm_tt_destroy = &radeon_ttm_tt_destroy,
> .eviction_valuable = ttm_bo_eviction_valuable,
> .evict_flags = &radeon_evict_flags,
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 82ea0abb5070..a2a61a8d1394 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -255,13 +255,6 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
> ret = ttm_bo_move_to_new_tt_mem(bo, ctx, mem);
> if (ret)
> goto out_err;
> -
> - if (mem->mem_type != TTM_PL_SYSTEM) {
> - ret = ttm_bo_tt_bind(bo, mem);
> - if (ret)
> - goto out_err;
> - }
> -
> }
>
> ret = bdev->driver->move(bo, evict, ctx, mem);
> @@ -1548,13 +1541,3 @@ void ttm_bo_tt_destroy(struct ttm_buffer_object *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)
> -{
> - return bo->bdev->driver->ttm_tt_bind(bo->bdev, bo->ttm, mem);
> -}
> -
> -void ttm_bo_tt_unbind(struct ttm_buffer_object *bo)
> -{
> - bo->bdev->driver->ttm_tt_unbind(bo->bdev, bo->ttm);
> -}
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
> index 4ceef9f7dce6..05768decb24c 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
> @@ -82,7 +82,6 @@ int ttm_bo_move_old_to_system(struct ttm_buffer_object *bo,
> return ret;
> }
>
> - ttm_bo_tt_unbind(bo);
> ttm_resource_free(bo, &bo->mem);
> old_mem->mem_type = TTM_PL_SYSTEM;
> return 0;
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> index 0b8d5655e416..0ff8feac6ba4 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> @@ -742,10 +742,14 @@ static int vmw_move(struct ttm_buffer_object *bo,
> ttm_bo_assign_mem(bo, new_mem);
> return 0;
> }
> - ret = ttm_bo_move_old_to_system(bo, ctx);
> +
> + ret = ttm_bo_wait_ctx(bo, ctx);
> if (ret)
> return ret;
>
> + vmw_ttm_unbind(bo->bdev, bo->ttm);
> + ttm_resource_free(bo, &bo->mem);
> +
> ret = ttm_bo_move_to_new_tt_mem(bo, ctx, new_mem);
> if (ret)
> return ret;
> @@ -763,8 +767,6 @@ struct ttm_bo_driver vmw_bo_driver = {
> .ttm_tt_create = &vmw_ttm_tt_create,
> .ttm_tt_populate = &vmw_ttm_populate,
> .ttm_tt_unpopulate = &vmw_ttm_unpopulate,
> - .ttm_tt_bind = &vmw_ttm_bind,
> - .ttm_tt_unbind = &vmw_ttm_unbind,
> .ttm_tt_destroy = &vmw_ttm_destroy,
> .eviction_valuable = ttm_bo_eviction_valuable,
> .evict_flags = vmw_evict_flags,
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index 58d2d3a5ed20..e400dbd2a143 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -90,31 +90,6 @@ struct ttm_bo_driver {
> */
> void (*ttm_tt_unpopulate)(struct ttm_bo_device *bdev, struct ttm_tt *ttm);
>
> - /**
> - * ttm_tt_bind
> - *
> - * @bdev: Pointer to a ttm device
> - * @ttm: Pointer to a struct ttm_tt.
> - * @bo_mem: Pointer to a struct ttm_resource describing the
> - * memory type and location for binding.
> - *
> - * Bind the backend pages into the aperture in the location
> - * indicated by @bo_mem. This function should be able to handle
> - * differences between aperture and system page sizes.
> - */
> - int (*ttm_tt_bind)(struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_resource *bo_mem);
> -
> - /**
> - * ttm_tt_unbind
> - *
> - * @bdev: Pointer to a ttm device
> - * @ttm: Pointer to a struct ttm_tt.
> - *
> - * Unbind previously bound backend pages. This function should be
> - * able to handle differences between aperture and system page sizes.
> - */
> - void (*ttm_tt_unbind)(struct ttm_bo_device *bdev, struct ttm_tt *ttm);
> -
> /**
> * ttm_tt_destroy
> *
> @@ -652,20 +627,6 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo);
> */
> pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
>
> -/**
> - * ttm_bo_tt_bind
> - *
> - * Bind the object tt to a memory resource.
> - */
> -int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem);
> -
> -/**
> - * ttm_bo_tt_bind
> - *
> - * Unbind the object tt from a memory resource.
> - */
> -void ttm_bo_tt_unbind(struct ttm_buffer_object *bo);
> -
> /**
> * ttm_bo_tt_destroy.
> */
More information about the dri-devel
mailing list