[PATCH 5/6] drm/ttm: revert "implement LRU add callbacks v2"
Sinclair Yeh
syeh at vmware.com
Tue Jan 24 18:28:37 UTC 2017
Minor typo
On Fri, Jan 13, 2017 at 10:51:10AM +0100, Christian König wrote:
> From: Christian König <christian.koenig at amd.com>
>
> The additional housekeeping had to much CPU overhead,
^
> let's use the BO priorities instead.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 --
> drivers/gpu/drm/ast/ast_ttm.c | 2 --
> drivers/gpu/drm/bochs/bochs_mm.c | 2 --
> drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 --
> drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 --
> drivers/gpu/drm/nouveau/nouveau_bo.c | 2 --
> drivers/gpu/drm/qxl/qxl_ttm.c | 2 --
> drivers/gpu/drm/radeon/radeon_ttm.c | 2 --
> drivers/gpu/drm/ttm/ttm_bo.c | 19 +++++--------------
> drivers/gpu/drm/virtio/virtgpu_ttm.c | 2 --
> drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 2 --
> include/drm/ttm/ttm_bo_driver.h | 9 ---------
> 12 files changed, 5 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index dd086d8..0402a11 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1086,8 +1086,6 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
> .fault_reserve_notify = &amdgpu_bo_fault_reserve_notify,
> .io_mem_reserve = &amdgpu_ttm_io_mem_reserve,
> .io_mem_free = &amdgpu_ttm_io_mem_free,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
>
> int amdgpu_ttm_init(struct amdgpu_device *adev)
> diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
> index 2a1368f..50c910e 100644
> --- a/drivers/gpu/drm/ast/ast_ttm.c
> +++ b/drivers/gpu/drm/ast/ast_ttm.c
> @@ -236,8 +236,6 @@ struct ttm_bo_driver ast_bo_driver = {
> .verify_access = ast_bo_verify_access,
> .io_mem_reserve = &ast_ttm_io_mem_reserve,
> .io_mem_free = &ast_ttm_io_mem_free,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
>
> int ast_mm_init(struct ast_private *ast)
> diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c
> index 099a3c6..e4c1125 100644
> --- a/drivers/gpu/drm/bochs/bochs_mm.c
> +++ b/drivers/gpu/drm/bochs/bochs_mm.c
> @@ -205,8 +205,6 @@ struct ttm_bo_driver bochs_bo_driver = {
> .verify_access = bochs_bo_verify_access,
> .io_mem_reserve = &bochs_ttm_io_mem_reserve,
> .io_mem_free = &bochs_ttm_io_mem_free,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
>
> int bochs_mm_init(struct bochs_device *bochs)
> diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
> index d6da848..f53aa8f 100644
> --- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
> +++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
> @@ -236,8 +236,6 @@ struct ttm_bo_driver cirrus_bo_driver = {
> .verify_access = cirrus_bo_verify_access,
> .io_mem_reserve = &cirrus_ttm_io_mem_reserve,
> .io_mem_free = &cirrus_ttm_io_mem_free,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
>
> int cirrus_mm_init(struct cirrus_device *cirrus)
> diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
> index 5e20220..657598b 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
> @@ -236,8 +236,6 @@ struct ttm_bo_driver mgag200_bo_driver = {
> .verify_access = mgag200_bo_verify_access,
> .io_mem_reserve = &mgag200_ttm_io_mem_reserve,
> .io_mem_free = &mgag200_ttm_io_mem_free,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
>
> int mgag200_mm_init(struct mga_device *mdev)
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 5b0a28b..3949a74 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -1570,8 +1570,6 @@ struct ttm_bo_driver nouveau_bo_driver = {
> .fault_reserve_notify = &nouveau_ttm_fault_reserve_notify,
> .io_mem_reserve = &nouveau_ttm_io_mem_reserve,
> .io_mem_free = &nouveau_ttm_io_mem_free,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
>
> struct nvkm_vma *
> diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
> index f3939a9..2955f91 100644
> --- a/drivers/gpu/drm/qxl/qxl_ttm.c
> +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
> @@ -395,8 +395,6 @@ static struct ttm_bo_driver qxl_bo_driver = {
> .io_mem_reserve = &qxl_ttm_io_mem_reserve,
> .io_mem_free = &qxl_ttm_io_mem_free,
> .move_notify = &qxl_bo_move_notify,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
>
> int qxl_ttm_init(struct qxl_device *qdev)
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 0cf03cc..d610481 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -871,8 +871,6 @@ static struct ttm_bo_driver radeon_bo_driver = {
> .fault_reserve_notify = &radeon_bo_fault_reserve_notify,
> .io_mem_reserve = &radeon_ttm_io_mem_reserve,
> .io_mem_free = &radeon_ttm_io_mem_free,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
>
> int radeon_ttm_init(struct radeon_device *rdev)
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index f078b43..59fac2f 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -163,6 +163,7 @@ static void ttm_bo_release_list(struct kref *list_kref)
> void ttm_bo_add_to_lru(struct ttm_buffer_object *bo)
> {
> struct ttm_bo_device *bdev = bo->bdev;
> + struct ttm_mem_type_manager *man;
>
> lockdep_assert_held(&bo->resv->lock.base);
>
> @@ -170,11 +171,13 @@ void ttm_bo_add_to_lru(struct ttm_buffer_object *bo)
>
> BUG_ON(!list_empty(&bo->lru));
>
> - list_add(&bo->lru, bdev->driver->lru_tail(bo));
> + man = &bdev->man[bo->mem.mem_type];
> + list_add_tail(&bo->lru, &man->lru[bo->priority]);
> kref_get(&bo->list_kref);
>
> if (bo->ttm && !(bo->ttm->page_flags & TTM_PAGE_FLAG_SG)) {
> - list_add(&bo->swap, bdev->driver->swap_lru_tail(bo));
> + list_add_tail(&bo->swap,
> + &bo->glob->swap_lru[bo->priority]);
> kref_get(&bo->list_kref);
> }
> }
> @@ -240,18 +243,6 @@ void ttm_bo_move_to_lru_tail(struct ttm_buffer_object *bo)
> }
> EXPORT_SYMBOL(ttm_bo_move_to_lru_tail);
>
> -struct list_head *ttm_bo_default_lru_tail(struct ttm_buffer_object *bo)
> -{
> - return bo->bdev->man[bo->mem.mem_type].lru[bo->priority].prev;
> -}
> -EXPORT_SYMBOL(ttm_bo_default_lru_tail);
> -
> -struct list_head *ttm_bo_default_swap_lru_tail(struct ttm_buffer_object *bo)
> -{
> - return bo->glob->swap_lru[bo->priority].prev;
> -}
> -EXPORT_SYMBOL(ttm_bo_default_swap_lru_tail);
> -
> /*
> * Call bo->mutex locked.
> */
> diff --git a/drivers/gpu/drm/virtio/virtgpu_ttm.c b/drivers/gpu/drm/virtio/virtgpu_ttm.c
> index 10387d7..a8875a7 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_ttm.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_ttm.c
> @@ -434,8 +434,6 @@ static struct ttm_bo_driver virtio_gpu_bo_driver = {
> .io_mem_free = &virtio_gpu_ttm_io_mem_free,
> .move_notify = &virtio_gpu_bo_move_notify,
> .swap_notify = &virtio_gpu_bo_swap_notify,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
>
> int virtio_gpu_ttm_init(struct virtio_gpu_device *vgdev)
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
> index caa279b..1de9669 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
> @@ -859,6 +859,4 @@ struct ttm_bo_driver vmw_bo_driver = {
> .fault_reserve_notify = &vmw_ttm_fault_reserve_notify,
> .io_mem_reserve = &vmw_ttm_io_mem_reserve,
> .io_mem_free = &vmw_ttm_io_mem_free,
> - .lru_tail = &ttm_bo_default_lru_tail,
> - .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
> };
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index 90dd5e9..a1235fa 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -468,12 +468,6 @@ struct ttm_bo_driver {
> * Called with LRU lock held immediately before the removal.
> */
> void (*lru_removal)(struct ttm_buffer_object *bo);
> -
> - /**
> - * Return the list_head after which a BO should be inserted in the LRU.
> - */
> - struct list_head *(*lru_tail)(struct ttm_buffer_object *bo);
> - struct list_head *(*swap_lru_tail)(struct ttm_buffer_object *bo);
> };
>
> /**
> @@ -788,9 +782,6 @@ extern void ttm_mem_io_unlock(struct ttm_mem_type_manager *man);
> extern void ttm_bo_del_sub_from_lru(struct ttm_buffer_object *bo);
> extern void ttm_bo_add_to_lru(struct ttm_buffer_object *bo);
>
> -struct list_head *ttm_bo_default_lru_tail(struct ttm_buffer_object *bo);
> -struct list_head *ttm_bo_default_swap_lru_tail(struct ttm_buffer_object *bo);
> -
> /**
> * __ttm_bo_reserve:
> *
> --
> 2.7.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
More information about the amd-gfx
mailing list