ttm tt refactor repost of part 1
Subsystems (7)
Dave Airlie
maintainercover ttm tt refactor repost of part 1
Most of these have r-b or acks already, patch 1 I may have posted before but found in my tree, so reposting it, and patch 5 for radeon I think were what needed re-review.
I'd like to land these, and I'll revisit the remainder of this series.
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 1/13 drm/ttm: introduce ttm_bo_move_null
From: Dave Airlie <[email protected]>
This pattern is cut-n-pasted across 4 drivers, switch it to a WARN_ON instead, as BUG_ON is considered a bad idea usually.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 24 +++--------------------- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +--- drivers/gpu/drm/qxl/qxl_ttm.c | 12 +----------- drivers/gpu/drm/radeon/radeon_ttm.c | 14 ++------------ include/drm/ttm/ttm_bo_driver.h | 17 +++++++++++++++++ 5 files changed, 24 insertions(+), 47 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -21
@@ -174,24 +174,6 @@ static int amdgpu_verify_access(struct ttm_buffer_object *bo, struct file *filp) filp->private_data); } -/** -* amdgpu_move_null - Register memory for a buffer object -* -* @bo: The bo to assign the memory to -* @new_mem: The memory to be assigned. -* -* Assign the memory from new_mem to the memory of the buffer object bo. -*/ -static void amdgpu_move_null (struct ttm_buffer_object *bo, -struct ttm_resource *new_mem) -{ -struct ttm_resource *old_mem = &bo->mem; - -BUG_ON (old_mem->mm_node !=NULL ); - *old_mem = *new_mem; - new_mem->mm_node =NULL ; -} -/** * amdgpu_mm_node_addr - Compute the GPU relative offset of a GTT buffer. *
@@ -676,7 +658,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, adev =amdgpu_ttm_adev (bo->bdev);if (old_mem->mem_type ==TTM_PL_SYSTEM && bo->ttm ==NULL ) { -amdgpu_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; } if ((old_mem->mem_type == TTM_PL_TT &&
@@ -684,7 +666,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, (old_mem->mem_type == TTM_PL_SYSTEM && new_mem->mem_type == TTM_PL_TT)) {/* bind is enough */ -amdgpu_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; } if (old_mem->mem_type == AMDGPU_PL_GDS ||
@@ -694,7 +676,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, new_mem->mem_type == AMDGPU_PL_GWS || new_mem->mem_type == AMDGPU_PL_OA) {/* Nothing to save here */ -amdgpu_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; }
drivers/gpu/drm/nouveau/nouveau_bo.c +1 -3
@@ -993,9 +993,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,/* Fake bo copy. */ if (old_reg->mem_type ==TTM_PL_SYSTEM && !bo->ttm) { -BUG_ON (bo->mem.mm_node !=NULL ); - bo->mem = *new_reg; - new_reg->mm_node =NULL ; +ttm_bo_move_null (bo, new_reg); goto out; }
drivers/gpu/drm/qxl/qxl_ttm.c +1 -11
@@ -159,16 +159,6 @@ static struct ttm_tt *qxl_ttm_tt_create(struct ttm_buffer_object *bo,return >t->ttm; } -static void qxl_move_null (struct ttm_buffer_object *bo, -struct ttm_resource *new_mem) -{ -struct ttm_resource *old_mem = &bo->mem; - -BUG_ON (old_mem->mm_node !=NULL ); - *old_mem = *new_mem; - new_mem->mm_node =NULL ; -} -static int qxl_bo_move (struct ttm_buffer_object *bo,bool evict,struct ttm_operation_ctx *ctx,struct ttm_resource *new_mem)
@@ -181,7 +171,7 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict,return ret;if (old_mem->mem_type ==TTM_PL_SYSTEM && bo->ttm ==NULL ) { -qxl_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; }return ttm_bo_move_memcpy (bo, ctx, new_mem);
drivers/gpu/drm/radeon/radeon_ttm.c +2 -12
@@ -148,16 +148,6 @@ static int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp) filp->private_data); } -static void radeon_move_null (struct ttm_buffer_object *bo, -struct ttm_resource *new_mem) -{ -struct ttm_resource *old_mem = &bo->mem; - -BUG_ON (old_mem->mm_node !=NULL ); - *old_mem = *new_mem; - new_mem->mm_node =NULL ; -} - static int radeon_move_blit(struct ttm_buffer_object *bo, bool evict, bool no_wait_gpu, struct ttm_resource *new_mem,
@@ -316,7 +306,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, rdev =radeon_get_rdev (bo->bdev);if (old_mem->mem_type ==TTM_PL_SYSTEM && bo->ttm ==NULL ) { -radeon_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; } if ((old_mem->mem_type == TTM_PL_TT &&
@@ -324,7 +314,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, (old_mem->mem_type == TTM_PL_SYSTEM && new_mem->mem_type == TTM_PL_TT)) {/* bind is enough */ -radeon_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; } if (!rdev->ring[radeon_copy_ring_index(rdev)].ready ||
include/drm/ttm/ttm_bo_driver.h +17 -0
@@ -520,6 +520,23 @@ static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bospin_unlock (&ttm_bo_glob.lru_lock); } +/** +* ttm_bo_move_null = assign memory for a buffer object. +* @bo: The bo to assign the memory to +* @new_mem: The memory to be assigned. +* +* Assign the memory from new_mem to the memory of the buffer object bo. +*/ +static inline void ttm_bo_move_null (struct ttm_buffer_object *bo, +struct ttm_resource *new_mem) +{ +struct ttm_resource *old_mem = &bo->mem; + +WARN_ON (old_mem->mm_node !=NULL ); + *old_mem = *new_mem; + new_mem->mm_node =NULL ; +} +/** * ttm_bo_unreserve *
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 01/13] drm/ttm: introduce ttm_bo_move_null
Am 07.09.20 um 22:46 schrieb Dave Airlie:
Quoted 6 lines
From: Dave Airlie <[email protected]>
This pattern is cut-n-pasted across 4 drivers, switch it to a
WARN_ONinstead, asBUG_ONis considered a bad idea usually.Signed-off-by Dave Airlie <[email protected]>
Quoted 166 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 24 +++--------------------- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +--- drivers/gpu/drm/qxl/qxl_ttm.c | 12 +----------- drivers/gpu/drm/radeon/radeon_ttm.c | 14 ++------------ include/drm/ttm/ttm_bo_driver.h | 17 +++++++++++++++++ 5 files changed, 24 insertions(+), 47 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3
-21@@ -174,24 +174,6 @@ static int amdgpu_verify_access(struct ttm_buffer_object *bo, struct file *filp) filp->private_data); } -/** -* amdgpu_move_null - Register memory for a buffer object -* -* @bo: The bo to assign the memory to -* @new_mem: The memory to be assigned. -* -* Assign the memory from new_mem to the memory of the buffer object bo. -*/ -static void amdgpu_move_null (struct ttm_buffer_object *bo, -struct ttm_resource *new_mem) -{ -struct ttm_resource *old_mem = &bo->mem; - -BUG_ON (old_mem->mm_node !=NULL ); - *old_mem = *new_mem; - new_mem->mm_node =NULL ; -} -/** * amdgpu_mm_node_addr - Compute the GPU relative offset of a GTT buffer. * @@ -676,7 +658,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, adev =amdgpu_ttm_adev (bo->bdev);if (old_mem->mem_type ==TTM_PL_SYSTEM && bo->ttm ==NULL ) { -amdgpu_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; } if ((old_mem->mem_type == TTM_PL_TT &&@@ -684,7 +666,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, (old_mem->mem_type == TTM_PL_SYSTEM && new_mem->mem_type == TTM_PL_TT)) {/* bind is enough */ -amdgpu_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; } if (old_mem->mem_type == AMDGPU_PL_GDS ||@@ -694,7 +676,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, new_mem->mem_type == AMDGPU_PL_GWS || new_mem->mem_type == AMDGPU_PL_OA) {/* Nothing to save here */ -amdgpu_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; }drivers/gpu/drm/nouveau/nouveau_bo.c +1
-3@@ -993,9 +993,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,/* Fake bo copy. */ if (old_reg->mem_type ==TTM_PL_SYSTEM && !bo->ttm) { -BUG_ON (bo->mem.mm_node !=NULL ); - bo->mem = *new_reg; - new_reg->mm_node =NULL ; +ttm_bo_move_null (bo, new_reg); goto out; }drivers/gpu/drm/qxl/qxl_ttm.c +1
-11@@ -159,16 +159,6 @@ static struct ttm_tt *qxl_ttm_tt_create(struct ttm_buffer_object *bo,return >t->ttm; } -static void qxl_move_null (struct ttm_buffer_object *bo, -struct ttm_resource *new_mem) -{ -struct ttm_resource *old_mem = &bo->mem; - -BUG_ON (old_mem->mm_node !=NULL ); - *old_mem = *new_mem; - new_mem->mm_node =NULL ; -} -static int qxl_bo_move (struct ttm_buffer_object *bo,bool evict,struct ttm_operation_ctx *ctx,struct ttm_resource *new_mem)@@ -181,7 +171,7 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict,return ret;if (old_mem->mem_type ==TTM_PL_SYSTEM && bo->ttm ==NULL ) { -qxl_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; }return ttm_bo_move_memcpy (bo, ctx, new_mem);drivers/gpu/drm/radeon/radeon_ttm.c +2
-12@@ -148,16 +148,6 @@ static int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp) filp->private_data); } -static void radeon_move_null (struct ttm_buffer_object *bo, -struct ttm_resource *new_mem) -{ -struct ttm_resource *old_mem = &bo->mem; - -BUG_ON (old_mem->mm_node !=NULL ); - *old_mem = *new_mem; - new_mem->mm_node =NULL ; -} - static int radeon_move_blit(struct ttm_buffer_object *bo, bool evict, bool no_wait_gpu, struct ttm_resource *new_mem,@@ -316,7 +306,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, rdev =radeon_get_rdev (bo->bdev);if (old_mem->mem_type ==TTM_PL_SYSTEM && bo->ttm ==NULL ) { -radeon_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; } if ((old_mem->mem_type == TTM_PL_TT &&@@ -324,7 +314,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, (old_mem->mem_type == TTM_PL_SYSTEM && new_mem->mem_type == TTM_PL_TT)) {/* bind is enough */ -radeon_move_null (bo, new_mem); +ttm_bo_move_null (bo, new_mem);return 0 ; } if (!rdev->ring[radeon_copy_ring_index(rdev)].ready ||include/drm/ttm/ttm_bo_driver.h +10
-0@@ -520,6 +520,23 @@ static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bospin_unlock (&ttm_bo_glob.lru_lock); } +/** +* ttm_bo_move_null = assign memory for a buffer object. +* @bo: The bo to assign the memory to +* @new_mem: The memory to be assigned. +* +* Assign the memory from new_mem to the memory of the buffer object bo. +*/ +static inline void ttm_bo_move_null (struct ttm_buffer_object *bo, +struct ttm_resource *new_mem) +{
include/drm/ttm/ttm_bo_driver.h static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bo · line 542
Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7
-0+struct ttm_resource *old_mem = &bo->mem; + +WARN_ON (old_mem->mm_node !=NULL ); + *old_mem = *new_mem; + new_mem->mm_node =NULL ; +} +/** * ttm_bo_unreserve *
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 2/13 drm/ttm: add optional bind/unbind via driver.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
I want to remove the backend funcs
--- drivers/gpu/drm/ttm/ttm_tt.c | 15 +++++++++++--- include/drm/ttm/ttm_bo_driver.h | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +12 -3
@@ -222,7 +222,10 @@ void ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *ttm)fput (ttm->swap_storage); ttm->swap_storage =NULL ; - ttm->func->destroy (bdev, ttm); +if (bdev->driver->ttm_tt_destroy) + bdev->driver->ttm_tt_destroy (bdev, ttm); +else + ttm->func->destroy (bdev, ttm); } static void ttm_tt_init_fields(struct ttm_tt *ttm,
@@ -310,7 +313,10 @@ EXPORT_SYMBOL(ttm_dma_tt_fini);void ttm_tt_unbind (struct ttm_bo_device *bdev,struct ttm_tt *ttm) {if (ttm->state == tt_bound) { - ttm->func->unbind (bdev, ttm); +if (bdev->driver->ttm_tt_unbind) + bdev->driver->ttm_tt_unbind (bdev, ttm); +else + ttm->func->unbind (bdev, ttm); ttm->state = tt_unbound; } }
@@ -331,7 +337,10 @@ int ttm_tt_bind(struct ttm_bo_device *bdev,if (ret)return ret; - ret = ttm->func->bind (bdev, ttm, bo_mem); +if (bdev->driver->ttm_tt_bind) + ret = bdev->driver->ttm_tt_bind (bdev, ttm, bo_mem); +else + ret = ttm->func->bind (bdev, ttm, bo_mem);if (unlikely (ret !=0 ))return ret;
include/drm/ttm/ttm_bo_driver.h +36 -0
@@ -90,6 +90,42 @@ 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 +* +* @bdev: Pointer to a ttm device +* @ttm: Pointer to a struct ttm_tt. +* +* Destroy the backend. This will be call back from ttm_tt_destroy so +* don't call ttm_tt_destroy from the callback or infinite loop. +*/ +void (*ttm_tt_destroy)(struct ttm_bo_device *bdev,struct ttm_tt *ttm); +/** * struct ttm_bo_driver member eviction_valuable *
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 3/13 drm/qxl: move bind/unbind/destroy to the driver function table.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
--- drivers/gpu/drm/qxl/qxl_ttm.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/qxl/qxl_ttm.c +3 -7
@@ -134,12 +134,6 @@ static void qxl_ttm_backend_destroy(struct ttm_bo_device *bdev,kfree (gtt); } -static struct ttm_backend_func qxl_backend_func = { - .bind = &qxl_ttm_backend_bind, - .unbind = &qxl_ttm_backend_unbind, - .destroy = &qxl_ttm_backend_destroy, -}; -static struct ttm_tt *qxl_ttm_tt_create (struct ttm_buffer_object *bo,uint32_t page_flags) {
@@ -150,7 +144,6 @@ static struct ttm_tt *qxl_ttm_tt_create(struct ttm_buffer_object *bo, gtt =kzalloc (sizeof (struct qxl_ttm_tt ),GFP_KERNEL );if (gtt ==NULL )return NULL ; - gtt->ttm.func = &qxl_backend_func; gtt->qdev = qdev;if (ttm_tt_init (>t->ttm, bo, page_flags)) {kfree (gtt);
@@ -195,6 +188,9 @@ 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,
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 03/13] drm/qxl: move bind/unbind/destroy to the driver function table.
Quoted 4 lines · Dave Airlie
From: Dave Airlie <[email protected]>
Acked-by Christian König <[email protected]>Signed-off-by Dave Airlie <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 4/13 drm/ttm/agp: export bind/unbind/destroy for drivers to use.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
--- drivers/gpu/drm/ttm/ttm_agp_backend.c | 15 +++++++++------ include/drm/ttm/ttm_tt.h | 6 ++++++ 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/ttm/ttm_agp_backend.c +9 -6
@@ -48,8 +48,8 @@ struct ttm_agp_backend {struct agp_bridge_data *bridge; }; -static int ttm_agp_bind (struct ttm_bo_device *bdev, -struct ttm_tt *ttm,struct ttm_resource *bo_mem) +int ttm_agp_bind (struct ttm_bo_device *bdev, +struct ttm_tt *ttm,struct ttm_resource *bo_mem) { struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);struct page *dummy_read_page = ttm_bo_glob.dummy_read_page;
@@ -82,9 +82,10 @@ static int ttm_agp_bind(struct ttm_bo_device *bdev,return ret; } +EXPORT_SYMBOL (ttm_agp_bind); -static void ttm_agp_unbind (struct ttm_bo_device *bdev, -struct ttm_tt *ttm) +void ttm_agp_unbind (struct ttm_bo_device *bdev, +struct ttm_tt *ttm) { struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);
@@ -97,9 +98,10 @@ static void ttm_agp_unbind(struct ttm_bo_device *bdev, agp_be->mem =NULL ; } } +EXPORT_SYMBOL (ttm_agp_unbind); -static void ttm_agp_destroy (struct ttm_bo_device *bdev, -struct ttm_tt *ttm) +void ttm_agp_destroy (struct ttm_bo_device *bdev, +struct ttm_tt *ttm) { struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);
@@ -108,6 +110,7 @@ static void ttm_agp_destroy(struct ttm_bo_device *bdev,ttm_tt_fini (ttm);kfree (agp_be); } +EXPORT_SYMBOL (ttm_agp_destroy);static struct ttm_backend_func ttm_agp_func = { .bind = ttm_agp_bind,
include/drm/ttm/ttm_tt.h +6 -0
@@ -266,6 +266,12 @@ struct ttm_tt *ttm_agp_tt_create(struct ttm_buffer_object *bo, uint32_t page_flags);int ttm_agp_tt_populate (struct ttm_bo_device *bdev,struct ttm_tt *ttm,struct ttm_operation_ctx *ctx);void ttm_agp_tt_unpopulate (struct ttm_bo_device *bdev,struct ttm_tt *ttm); +int ttm_agp_bind (struct ttm_bo_device *bdev, +struct ttm_tt *ttm,struct ttm_resource *bo_mem); +void ttm_agp_unbind (struct ttm_bo_device *bdev, +struct ttm_tt *ttm); +void ttm_agp_destroy (struct ttm_bo_device *bdev, +struct ttm_tt *ttm);#endif #endif
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 5/13 drm/radeon/ttm: move to driver binding/destroy functions. (v2)
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
Do agp decision in the driver, instead of special binding funcs
v2: use container_of, drop some {}.
--- drivers/gpu/drm/radeon/radeon.h | 7 +- drivers/gpu/drm/radeon/radeon_cs.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 6 +- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_prime.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 92 +++++++++++++++++++------- drivers/gpu/drm/radeon/radeon_vm.c | 2 +- 7 files changed, 80 insertions(+), 33 deletions(-)
drivers/gpu/drm/radeon/radeon.h +4 -3
@@ -2815,10 +2815,11 @@ extern void radeon_legacy_set_clock_gating(struct radeon_device *rdev, int enablextern void radeon_atom_set_clock_gating (struct radeon_device *rdev,int enable);extern void radeon_ttm_placement_from_domain (struct radeon_bo *rbo,u32 domain);extern bool radeon_ttm_bo_is_radeon_bo (struct ttm_buffer_object *bo); -extern int radeon_ttm_tt_set_userptr (struct ttm_tt *ttm,uint64_t addr, +extern int radeon_ttm_tt_set_userptr (struct radeon_device *rdev, +struct ttm_tt *ttm,uint64_t addr,uint32_t flags); -extern bool radeon_ttm_tt_has_userptr (struct ttm_tt *ttm); -extern bool radeon_ttm_tt_is_readonly (struct ttm_tt *ttm); +extern bool radeon_ttm_tt_has_userptr (struct radeon_device *rdev,struct ttm_tt *ttm); +extern bool radeon_ttm_tt_is_readonly (struct radeon_device *rdev,struct ttm_tt *ttm);extern void radeon_vram_location (struct radeon_device *rdev,struct radeon_mc *mc,u64 base);extern void radeon_gtt_location (struct radeon_device *rdev,struct radeon_mc *mc);extern int radeon_resume_kms (struct drm_device *dev,bool resume,bool fbcon);
drivers/gpu/drm/radeon/radeon_cs.c +1 -1
@@ -160,7 +160,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) p->relocs[i].allowed_domains = domain; } -if (radeon_ttm_tt_has_userptr (p->relocs[i].robj->tbo.ttm)) { +if (radeon_ttm_tt_has_userptr (p->rdev, p->relocs[i].robj->tbo.ttm)) {uint32_t domain = p->relocs[i].preferred_domains;if (!(domain &RADEON_GEM_DOMAIN_GTT )) { DRM_ERROR("Only RADEON_GEM_DOMAIN_GTT is "
drivers/gpu/drm/radeon/radeon_gem.c +3 -3
@@ -331,7 +331,7 @@ int radeon_gem_userptr_ioctl(struct drm_device *dev, void *data, goto handle_lockup; bo =gem_to_radeon_bo (gobj); - r =radeon_ttm_tt_set_userptr (bo->tbo.ttm, args->addr, args->flags); + r =radeon_ttm_tt_set_userptr (rdev, bo->tbo.ttm, args->addr, args->flags);if (r) goto release_object;
@@ -420,7 +420,7 @@ int radeon_mode_dumb_mmap(struct drm_file *filp,return -ENOENT ; } robj =gem_to_radeon_bo (gobj); -if (radeon_ttm_tt_has_userptr (robj->tbo.ttm)) { +if (radeon_ttm_tt_has_userptr (robj->rdev, robj->tbo.ttm)) {drm_gem_object_put (gobj);return -EPERM ; }
@@ -721,7 +721,7 @@ int radeon_gem_op_ioctl(struct drm_device *dev, void *data, robj =gem_to_radeon_bo (gobj); r = -EPERM ; -if (radeon_ttm_tt_has_userptr (robj->tbo.ttm)) +if (radeon_ttm_tt_has_userptr (robj->rdev, robj->tbo.ttm)) goto out; r =radeon_bo_reserve (robj, false);
drivers/gpu/drm/radeon/radeon_object.c +1 -1
@@ -331,7 +331,7 @@ int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset,struct ttm_operation_ctx ctx = { false, false };int r, i; -if (radeon_ttm_tt_has_userptr (bo->tbo.ttm)) +if (radeon_ttm_tt_has_userptr (bo->rdev, bo->tbo.ttm))return -EPERM ;if (bo->pin_count) {
drivers/gpu/drm/radeon/radeon_prime.c +1 -1
@@ -121,7 +121,7 @@ struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, int flags) {struct radeon_bo *bo =gem_to_radeon_bo (gobj); -if (radeon_ttm_tt_has_userptr (bo->tbo.ttm)) +if (radeon_ttm_tt_has_userptr (bo->rdev, bo->tbo.ttm))return ERR_PTR (-EPERM );return drm_gem_prime_export (gobj, flags); }
drivers/gpu/drm/radeon/radeon_ttm.c +69 -23
171 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_vm.c +1 -1
@@ -942,7 +942,7 @@ int radeon_vm_bo_update(struct radeon_device *rdev, bo_va->flags &= ~RADEON_VM_PAGE_VALID ; bo_va->flags &= ~RADEON_VM_PAGE_SYSTEM ; bo_va->flags &= ~RADEON_VM_PAGE_SNOOPED ; -if (bo_va->bo &&radeon_ttm_tt_is_readonly (bo_va->bo->tbo.ttm)) +if (bo_va->bo &&radeon_ttm_tt_is_readonly (rdev, bo_va->bo->tbo.ttm)) bo_va->flags &= ~RADEON_VM_PAGE_WRITEABLE ;if (mem) {
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 05/13] drm/radeon/ttm: move to driver binding/destroy functions. (v2)
Am 07.09.20 um 22:46 schrieb Dave Airlie:
Quoted 7 lines
From: Dave Airlie <[email protected]>
Do agp decision in the driver, instead of special binding funcs
v2: use
container_of, drop some {}.Signed-off-by Dave Airlie <[email protected]>
Quoted 290 lines
--- drivers/gpu/drm/radeon/radeon.h | 7 +- drivers/gpu/drm/radeon/radeon_cs.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 6 +- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_prime.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 92 +++++++++++++++++++------- drivers/gpu/drm/radeon/radeon_vm.c | 2 +- 7 files changed, 80 insertions(+), 33 deletions(-)drivers/gpu/drm/radeon/radeon.h +4
-3@@ -2815,10 +2815,11 @@ extern void radeon_legacy_set_clock_gating(struct radeon_device *rdev, int enablextern void radeon_atom_set_clock_gating (struct radeon_device *rdev,int enable);extern void radeon_ttm_placement_from_domain (struct radeon_bo *rbo,u32 domain);extern bool radeon_ttm_bo_is_radeon_bo (struct ttm_buffer_object *bo); -extern int radeon_ttm_tt_set_userptr (struct ttm_tt *ttm,uint64_t addr, +extern int radeon_ttm_tt_set_userptr (struct radeon_device *rdev, +struct ttm_tt *ttm,uint64_t addr,uint32_t flags); -extern bool radeon_ttm_tt_has_userptr (struct ttm_tt *ttm); -extern bool radeon_ttm_tt_is_readonly (struct ttm_tt *ttm); +extern bool radeon_ttm_tt_has_userptr (struct radeon_device *rdev,struct ttm_tt *ttm); +extern bool radeon_ttm_tt_is_readonly (struct radeon_device *rdev,struct ttm_tt *ttm);extern void radeon_vram_location (struct radeon_device *rdev,struct radeon_mc *mc,u64 base);extern void radeon_gtt_location (struct radeon_device *rdev,struct radeon_mc *mc);extern int radeon_resume_kms (struct drm_device *dev,bool resume,bool fbcon);drivers/gpu/drm/radeon/radeon_cs.c +1
-1@@ -160,7 +160,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) p->relocs[i].allowed_domains = domain; } -if (radeon_ttm_tt_has_userptr (p->relocs[i].robj->tbo.ttm)) { +if (radeon_ttm_tt_has_userptr (p->rdev, p->relocs[i].robj->tbo.ttm)) {uint32_t domain = p->relocs[i].preferred_domains;if (!(domain &RADEON_GEM_DOMAIN_GTT )) { DRM_ERROR("Only RADEON_GEM_DOMAIN_GTT is "drivers/gpu/drm/radeon/radeon_gem.c +3
-3@@ -331,7 +331,7 @@ int radeon_gem_userptr_ioctl(struct drm_device *dev, void *data, goto handle_lockup; bo =gem_to_radeon_bo (gobj); - r =radeon_ttm_tt_set_userptr (bo->tbo.ttm, args->addr, args->flags); + r =radeon_ttm_tt_set_userptr (rdev, bo->tbo.ttm, args->addr, args->flags);if (r) goto release_object;@@ -420,7 +420,7 @@ int radeon_mode_dumb_mmap(struct drm_file *filp,return -ENOENT ; } robj =gem_to_radeon_bo (gobj); -if (radeon_ttm_tt_has_userptr (robj->tbo.ttm)) { +if (radeon_ttm_tt_has_userptr (robj->rdev, robj->tbo.ttm)) {drm_gem_object_put (gobj);return -EPERM ; }@@ -721,7 +721,7 @@ int radeon_gem_op_ioctl(struct drm_device *dev, void *data, robj =gem_to_radeon_bo (gobj); r = -EPERM ; -if (radeon_ttm_tt_has_userptr (robj->tbo.ttm)) +if (radeon_ttm_tt_has_userptr (robj->rdev, robj->tbo.ttm)) goto out; r =radeon_bo_reserve (robj, false);drivers/gpu/drm/radeon/radeon_object.c +1
-1@@ -331,7 +331,7 @@ int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset,struct ttm_operation_ctx ctx = { false, false };int r, i; -if (radeon_ttm_tt_has_userptr (bo->tbo.ttm)) +if (radeon_ttm_tt_has_userptr (bo->rdev, bo->tbo.ttm))return -EPERM ;if (bo->pin_count) {drivers/gpu/drm/radeon/radeon_prime.c +1
-1@@ -121,7 +121,7 @@ struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, int flags) {struct radeon_bo *bo =gem_to_radeon_bo (gobj); -if (radeon_ttm_tt_has_userptr (bo->tbo.ttm)) +if (radeon_ttm_tt_has_userptr (bo->rdev, bo->tbo.ttm))return ERR_PTR (-EPERM );return drm_gem_prime_export (gobj, flags); }drivers/gpu/drm/radeon/radeon_ttm.c +69
-23@@ -141,8 +141,9 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo,static int radeon_verify_access (struct ttm_buffer_object *bo,struct file *filp) { struct radeon_bo *rbo = container_of(bo, struct radeon_bo, tbo); +struct radeon_device *rdev =radeon_get_rdev (bo->bdev); -if (radeon_ttm_tt_has_userptr (bo->ttm)) +if (radeon_ttm_tt_has_userptr (rdev, bo->ttm))return -EPERM ;return drm_vma_node_verify_access (&rbo->tbo.base.vma_node, filp->private_data);@@ -561,12 +562,6 @@ static void radeon_ttm_backend_destroy(struct ttm_bo_device *bdev, struct ttm_ttkfree (gtt); } -static struct ttm_backend_func radeon_backend_func = { - .bind = &radeon_ttm_backend_bind, - .unbind = &radeon_ttm_backend_unbind, - .destroy = &radeon_ttm_backend_destroy, -}; -static struct ttm_tt *radeon_ttm_tt_create (struct ttm_buffer_object *bo,uint32_t page_flags) {@@ -585,7 +580,6 @@ static struct ttm_tt *radeon_ttm_tt_create(struct ttm_buffer_object *bo,if (gtt ==NULL ) {return NULL ; } - gtt->ttm.ttm.func = &radeon_backend_func;if (ttm_dma_tt_init (>t->ttm, bo, page_flags)) {kfree (gtt);return NULL ;@@ -593,19 +587,25 @@ static struct ttm_tt *radeon_ttm_tt_create(struct ttm_buffer_object *bo,return >t->ttm.ttm; } -static struct radeon_ttm_tt *radeon_ttm_tt_to_gtt (struct ttm_tt *ttm) +static struct radeon_ttm_tt *radeon_ttm_tt_to_gtt (struct radeon_device *rdev, +struct ttm_tt *ttm) { -if (!ttm || ttm->func != &radeon_backend_func) +#if IS_ENABLED (CONFIG_AGP ) +if (rdev->flags &RADEON_IS_AGP ) +return NULL ; +#endif + +if (!ttm)return NULL ; -return (struct radeon_ttm_tt *)ttm; + return container_of(ttm, struct radeon_ttm_tt, ttm.ttm); }static int radeon_ttm_tt_populate (struct ttm_bo_device *bdev,struct ttm_tt *ttm,struct ttm_operation_ctx *ctx) { -struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (ttm); -struct radeon_device *rdev; +struct radeon_device *rdev =radeon_get_rdev (bdev); +struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (rdev, ttm);bool slave = !!(ttm->page_flags &TTM_PAGE_FLAG_SG );if (gtt && gtt->userptr) {@@ -625,7 +625,6 @@ static int radeon_ttm_tt_populate(struct ttm_bo_device *bdev,return 0 ; } - rdev =radeon_get_rdev (bdev);#if IS_ENABLED (CONFIG_AGP )if (rdev->flags &RADEON_IS_AGP ) {return ttm_agp_tt_populate (bdev, ttm, ctx);@@ -643,8 +642,8 @@ static int radeon_ttm_tt_populate(struct ttm_bo_device *bdev,static void radeon_ttm_tt_unpopulate (struct ttm_bo_device *bdev,struct ttm_tt *ttm) { -struct radeon_device *rdev; -struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (ttm); +struct radeon_device *rdev =radeon_get_rdev (bdev); +struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (rdev, ttm);bool slave = !!(ttm->page_flags &TTM_PAGE_FLAG_SG );if (gtt && gtt->userptr) {@@ -656,7 +655,6 @@ static void radeon_ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *if (slave)return ; - rdev =radeon_get_rdev (bdev);#if IS_ENABLED (CONFIG_AGP )if (rdev->flags &RADEON_IS_AGP ) {ttm_agp_tt_unpopulate (bdev, ttm);@@ -674,10 +672,11 @@ static void radeon_ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *ttm_unmap_and_unpopulate_pages (rdev->dev, >t->ttm); } -int radeon_ttm_tt_set_userptr (struct ttm_tt *ttm,uint64_t addr, +int radeon_ttm_tt_set_userptr (struct radeon_device *rdev, +struct ttm_tt *ttm,uint64_t addr,uint32_t flags) { -struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (ttm); +struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (rdev, ttm);if (gtt ==NULL )return -EINVAL ;@@ -688,9 +687,52 @@ int radeon_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,return 0 ; } -bool radeon_ttm_tt_has_userptr (struct ttm_tt *ttm) +static int radeon_ttm_tt_bind (struct ttm_bo_device *bdev, +struct ttm_tt *ttm, +struct ttm_resource *bo_mem) +{ +struct radeon_device *rdev =radeon_get_rdev (bdev); + +#if IS_ENABLED (CONFIG_AGP ) +if (rdev->flags &RADEON_IS_AGP ) +return ttm_agp_bind (bdev, ttm, bo_mem); +#endif + +return radeon_ttm_backend_bind (bdev, ttm, bo_mem); +} + +static void radeon_ttm_tt_unbind (struct ttm_bo_device *bdev, +struct ttm_tt *ttm) +{ +#if IS_ENABLED (CONFIG_AGP ) +struct radeon_device *rdev =radeon_get_rdev (bdev); + +if (rdev->flags &RADEON_IS_AGP ) { +ttm_agp_unbind (bdev, ttm); +return ; + } +#endif +radeon_ttm_backend_unbind (bdev, ttm); +} + +static void radeon_ttm_tt_destroy (struct ttm_bo_device *bdev, +struct ttm_tt *ttm) +{ +#if IS_ENABLED (CONFIG_AGP ) +struct radeon_device *rdev =radeon_get_rdev (bdev); + +if (rdev->flags &RADEON_IS_AGP ) { +ttm_agp_destroy (bdev, ttm); +return ; + } +#endif +radeon_ttm_backend_destroy (bdev, ttm); +} + +bool radeon_ttm_tt_has_userptr (struct radeon_device *rdev, +struct ttm_tt *ttm) { -struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (ttm); +struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (rdev, ttm);if (gtt ==NULL )return false;@@ -698,9 +740,10 @@ bool radeon_ttm_tt_has_userptr(struct ttm_tt *ttm)return !!gtt->userptr; } -bool radeon_ttm_tt_is_readonly (struct ttm_tt *ttm) +bool radeon_ttm_tt_is_readonly (struct radeon_device *rdev, +struct ttm_tt *ttm) { -struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (ttm); +struct radeon_ttm_tt *gtt =radeon_ttm_tt_to_gtt (rdev, ttm);if (gtt ==NULL )return false;@@ -712,6 +755,9 @@ 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, .move = &radeon_bo_move,drivers/gpu/drm/radeon/radeon_vm.c +0
-0
drivers/gpu/drm/radeon/radeon_vm.c int radeon_vm_bo_update(struct radeon_device *rdev, · line 948
Quoted 8 lines
drivers/gpu/drm/radeon/radeon_vm.c +1
-1@@ -942,7 +942,7 @@ int radeon_vm_bo_update(struct radeon_device *rdev, bo_va->flags &= ~RADEON_VM_PAGE_VALID ; bo_va->flags &= ~RADEON_VM_PAGE_SYSTEM ; bo_va->flags &= ~RADEON_VM_PAGE_SNOOPED ; -if (bo_va->bo &&radeon_ttm_tt_is_readonly (bo_va->bo->tbo.ttm)) +if (bo_va->bo &&radeon_ttm_tt_is_readonly (rdev, bo_va->bo->tbo.ttm)) bo_va->flags &= ~RADEON_VM_PAGE_WRITEABLE ;if (mem) {
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 6/13 drm/nouveau/ttm: use driver bind/unbind/destroy functions.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 44 ++++++++++++++++++++ drivers/gpu/drm/nouveau/nouveau_sgdma.c | 54 ++++++------------------- drivers/gpu/drm/nouveau/nouveau_ttm.h | 3 ++ 3 files changed, 59 insertions(+), 42 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +44 -0
@@ -668,6 +668,33 @@ nouveau_ttm_tt_create(struct ttm_buffer_object *bo, uint32_t page_flags)return nouveau_sgdma_create_ttm (bo, page_flags); } +static int +nouveau_ttm_tt_bind (struct ttm_bo_device *bdev,struct ttm_tt *ttm, +struct ttm_resource *reg) +{ +#if IS_ENABLED (CONFIG_AGP ) +struct nouveau_drm *drm =nouveau_bdev (bdev); + +if (drm->agp.bridge) +return ttm_agp_bind (bdev, ttm, reg); +#endif +return nouveau_sgdma_bind (bdev, ttm, reg); +} + +static void +nouveau_ttm_tt_unbind (struct ttm_bo_device *bdev,struct ttm_tt *ttm) +{ +#if IS_ENABLED (CONFIG_AGP ) +struct nouveau_drm *drm =nouveau_bdev (bdev); + +if (drm->agp.bridge) { +ttm_agp_unbind (bdev, ttm); +return ; + } +#endif +nouveau_sgdma_unbind (bdev, ttm); +} +static void nouveau_bo_evict_flags (struct ttm_buffer_object *bo,struct ttm_placement *pl) {
@@ -1285,6 +1312,20 @@ nouveau_ttm_tt_unpopulate(struct ttm_bo_device *bdev,ttm_unmap_and_unpopulate_pages (dev, ttm_dma); } +static void +nouveau_ttm_tt_destroy (struct ttm_bo_device *bdev, +struct ttm_tt *ttm) +{ +#if IS_ENABLED (CONFIG_AGP ) +struct nouveau_drm *drm =nouveau_bdev (bdev); +if (drm->agp.bridge) { +ttm_agp_destroy (bdev, ttm); +return ; + } +#endif +nouveau_sgdma_destroy (bdev, ttm); +} +void nouveau_bo_fence (struct nouveau_bo *nvbo,struct nouveau_fence *fence,bool exclusive) {
@@ -1300,6 +1341,9 @@ 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, .move_notify = nouveau_bo_move_ntfy,
drivers/gpu/drm/nouveau/nouveau_sgdma.c +12 -42
94 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_ttm.h +3 -0
@@ -22,4 +22,7 @@ int nouveau_ttm_mmap(struct file *, struct vm_area_struct *);int nouveau_ttm_global_init (struct nouveau_drm *);void nouveau_ttm_global_release (struct nouveau_drm *); +int nouveau_sgdma_bind (struct ttm_bo_device *bdev,struct ttm_tt *ttm,struct ttm_resource *reg); +void nouveau_sgdma_unbind (struct ttm_bo_device *bdev,struct ttm_tt *ttm); +void nouveau_sgdma_destroy (struct ttm_bo_device *bdev,struct ttm_tt *ttm);#endif
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 7/13 drm/vmwgfx: move to driver binding functions
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
--- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +3 -7
@@ -668,12 +668,6 @@ static void vmw_ttm_unpopulate(struct ttm_bo_device *bdev,ttm_pool_unpopulate (ttm); } -static struct ttm_backend_func vmw_ttm_func = { - .bind = vmw_ttm_bind, - .unbind = vmw_ttm_unbind, - .destroy = vmw_ttm_destroy, -}; -static struct ttm_tt *vmw_ttm_tt_create (struct ttm_buffer_object *bo,uint32_t page_flags) {
@@ -684,7 +678,6 @@ static struct ttm_tt *vmw_ttm_tt_create(struct ttm_buffer_object *bo,if (!vmw_be)return NULL ; - vmw_be->dma_ttm.ttm.func = &vmw_ttm_func; vmw_be->dev_priv = container_of(bo->bdev, struct vmw_private, bdev); vmw_be->mob =NULL ;
@@ -770,6 +763,9 @@ 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, .move = NULL,
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 8/13 drm/amdgpu/ttm: move to driver backend binding funcs
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -7
@@ -1255,12 +1255,6 @@ static void amdgpu_ttm_backend_destroy(struct ttm_bo_device *bdev,kfree (gtt); } -static struct ttm_backend_func amdgpu_backend_func = { - .bind = &amdgpu_ttm_backend_bind, - .unbind = &amdgpu_ttm_backend_unbind, - .destroy = &amdgpu_ttm_backend_destroy, -}; -/** * amdgpu_ttm_tt_create - Create a ttm_tt object for a given BO *
@@ -1277,7 +1271,6 @@ static struct ttm_tt *amdgpu_ttm_tt_create(struct ttm_buffer_object *bo,if (gtt ==NULL ) {return NULL ; } - gtt->ttm.ttm.func = &amdgpu_backend_func; gtt->gobj = &bo->base;/* allocate space for the uninitialized page entries */
@@ -1679,6 +1672,9 @@ 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, .move = &amdgpu_bo_move,
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 9/13 drm/gem_vram/ttm: move to driver backend destroy function.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
--- drivers/gpu/drm/drm_gem_vram_helper.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +2 -7
@@ -967,16 +967,12 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = {* TTM TT */ -static void backend_func_destroy (struct ttm_bo_device *bdev,struct ttm_tt *tt) +static void bo_driver_ttm_tt_destroy (struct ttm_bo_device *bdev,struct ttm_tt *tt) {ttm_tt_fini (tt);kfree (tt); } -static struct ttm_backend_func backend_func = { - .destroy = backend_func_destroy -}; -/* * TTM BO device */
@@ -991,8 +987,6 @@ static struct ttm_tt *bo_driver_ttm_tt_create(struct ttm_buffer_object *bo,if (!tt)return NULL ; - tt->func = &backend_func; - ret =ttm_tt_init (tt, bo, page_flags);if (ret <0 ) goto err_ttm_tt_init;
@@ -1055,6 +1049,7 @@ static int bo_driver_io_mem_reserve(struct ttm_bo_device *bdev,static struct ttm_bo_driver bo_driver = { .ttm_tt_create = bo_driver_ttm_tt_create, + .ttm_tt_destroy = bo_driver_ttm_tt_destroy, .eviction_valuable = ttm_bo_eviction_valuable, .evict_flags = bo_driver_evict_flags, .move_notify = bo_driver_move_notify,
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 10/13 drm/ttm/agp: drop back end bindings from agp
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
These aren't used anymore.
--- drivers/gpu/drm/ttm/ttm_agp_backend.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/gpu/drm/ttm/ttm_agp_backend.c +0 -7
@@ -112,12 +112,6 @@ void ttm_agp_destroy(struct ttm_bo_device *bdev, }EXPORT_SYMBOL (ttm_agp_destroy); -static struct ttm_backend_func ttm_agp_func = { - .bind = ttm_agp_bind, - .unbind = ttm_agp_unbind, - .destroy = ttm_agp_destroy, -}; -struct ttm_tt *ttm_agp_tt_create (struct ttm_buffer_object *bo,struct agp_bridge_data *bridge,uint32_t page_flags)
@@ -130,7 +124,6 @@ struct ttm_tt *ttm_agp_tt_create(struct ttm_buffer_object *bo, agp_be->mem =NULL ; agp_be->bridge = bridge; - agp_be->ttm.func = &ttm_agp_func;if (ttm_tt_init (&agp_be->ttm, bo, page_flags)) {kfree (agp_be);
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 11/13 drm/ttm: get rid of agp specific populate/unpopulate paths.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++-- drivers/gpu/drm/ttm/ttm_agp_backend.c | 17 ----------------- include/drm/ttm/ttm_tt.h | 2 -- 4 files changed, 4 insertions(+), 23 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -2
@@ -1268,7 +1268,7 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bdev,#if IS_ENABLED (CONFIG_AGP )if (drm->agp.bridge) { -return ttm_agp_tt_populate (bdev, ttm, ctx); +return ttm_pool_populate (ttm, ctx); }#endif
@@ -1297,7 +1297,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_bo_device *bdev,#if IS_ENABLED (CONFIG_AGP )if (drm->agp.bridge) { -ttm_agp_tt_unpopulate (bdev, ttm); +ttm_pool_unpopulate (ttm);return ; }#endif
drivers/gpu/drm/radeon/radeon_ttm.c +2 -2
@@ -627,7 +627,7 @@ static int radeon_ttm_tt_populate(struct ttm_bo_device *bdev,#if IS_ENABLED (CONFIG_AGP )if (rdev->flags &RADEON_IS_AGP ) { -return ttm_agp_tt_populate (bdev, ttm, ctx); +return ttm_pool_populate (ttm, ctx); }#endif
@@ -657,7 +657,7 @@ static void radeon_ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *#if IS_ENABLED (CONFIG_AGP )if (rdev->flags &RADEON_IS_AGP ) { -ttm_agp_tt_unpopulate (bdev, ttm); +ttm_pool_unpopulate (ttm);return ; }#endif
drivers/gpu/drm/ttm/ttm_agp_backend.c +0 -17
@@ -133,20 +133,3 @@ struct ttm_tt *ttm_agp_tt_create(struct ttm_buffer_object *bo,return &agp_be->ttm; }EXPORT_SYMBOL (ttm_agp_tt_create); - -int ttm_agp_tt_populate (struct ttm_bo_device *bdev, -struct ttm_tt *ttm,struct ttm_operation_ctx *ctx) -{ -if (ttm->state != tt_unpopulated) -return 0 ; - -return ttm_pool_populate (ttm, ctx); -} -EXPORT_SYMBOL (ttm_agp_tt_populate); - -void ttm_agp_tt_unpopulate (struct ttm_bo_device *bdev, -struct ttm_tt *ttm) -{ -ttm_pool_unpopulate (ttm); -} -EXPORT_SYMBOL (ttm_agp_tt_unpopulate);
include/drm/ttm/ttm_tt.h +0 -2
@@ -264,8 +264,6 @@ void ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *ttm);struct ttm_tt *ttm_agp_tt_create (struct ttm_buffer_object *bo,struct agp_bridge_data *bridge,uint32_t page_flags); -int ttm_agp_tt_populate (struct ttm_bo_device *bdev,struct ttm_tt *ttm,struct ttm_operation_ctx *ctx); -void ttm_agp_tt_unpopulate (struct ttm_bo_device *bdev,struct ttm_tt *ttm);int ttm_agp_bind (struct ttm_bo_device *bdev,struct ttm_tt *ttm,struct ttm_resource *bo_mem); void ttm_agp_unbind(struct ttm_bo_device *bdev,
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 12/13 drm/ttm/agp: remove bdev from agp helpers
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
Since the agp bind/unbind/destroy are now getting called from drivers rather than via the func table, drop the bdev parameter.
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +++--- drivers/gpu/drm/radeon/radeon_ttm.c | 6 +++--- drivers/gpu/drm/ttm/ttm_agp_backend.c | 11 ++++------- include/drm/ttm/ttm_tt.h | 9 +++------ 4 files changed, 13 insertions(+), 19 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +3 -3
@@ -676,7 +676,7 @@ nouveau_ttm_tt_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm,struct nouveau_drm *drm =nouveau_bdev (bdev);if (drm->agp.bridge) -return ttm_agp_bind (bdev, ttm, reg); +return ttm_agp_bind (ttm, reg);#endif return nouveau_sgdma_bind (bdev, ttm, reg); }
@@ -688,7 +688,7 @@ nouveau_ttm_tt_unbind(struct ttm_bo_device *bdev, struct ttm_tt *ttm)struct nouveau_drm *drm =nouveau_bdev (bdev);if (drm->agp.bridge) { -ttm_agp_unbind (bdev, ttm); +ttm_agp_unbind (ttm);return ; }#endif
@@ -1319,7 +1319,7 @@ nouveau_ttm_tt_destroy(struct ttm_bo_device *bdev,#if IS_ENABLED (CONFIG_AGP )struct nouveau_drm *drm =nouveau_bdev (bdev);if (drm->agp.bridge) { -ttm_agp_destroy (bdev, ttm); +ttm_agp_destroy (ttm);return ; }#endif
drivers/gpu/drm/radeon/radeon_ttm.c +3 -3
@@ -695,7 +695,7 @@ static int radeon_ttm_tt_bind(struct ttm_bo_device *bdev,#if IS_ENABLED (CONFIG_AGP )if (rdev->flags &RADEON_IS_AGP ) -return ttm_agp_bind (bdev, ttm, bo_mem); +return ttm_agp_bind (ttm, bo_mem);#endif return radeon_ttm_backend_bind (bdev, ttm, bo_mem);
@@ -708,7 +708,7 @@ static void radeon_ttm_tt_unbind(struct ttm_bo_device *bdev,struct radeon_device *rdev =radeon_get_rdev (bdev);if (rdev->flags &RADEON_IS_AGP ) { -ttm_agp_unbind (bdev, ttm); +ttm_agp_unbind (ttm);return ; }#endif
@@ -722,7 +722,7 @@ static void radeon_ttm_tt_destroy(struct ttm_bo_device *bdev,struct radeon_device *rdev =radeon_get_rdev (bdev);if (rdev->flags &RADEON_IS_AGP ) { -ttm_agp_destroy (bdev, ttm); +ttm_agp_destroy (ttm);return ; }#endif
drivers/gpu/drm/ttm/ttm_agp_backend.c +4 -7
@@ -48,8 +48,7 @@ struct ttm_agp_backend {struct agp_bridge_data *bridge; }; -int ttm_agp_bind (struct ttm_bo_device *bdev, -struct ttm_tt *ttm,struct ttm_resource *bo_mem) +int ttm_agp_bind (struct ttm_tt *ttm,struct ttm_resource *bo_mem) { struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);struct page *dummy_read_page = ttm_bo_glob.dummy_read_page;
@@ -84,8 +83,7 @@ int ttm_agp_bind(struct ttm_bo_device *bdev, }EXPORT_SYMBOL (ttm_agp_bind); -void ttm_agp_unbind (struct ttm_bo_device *bdev, -struct ttm_tt *ttm) +void ttm_agp_unbind (struct ttm_tt *ttm) { struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);
@@ -100,13 +98,12 @@ void ttm_agp_unbind(struct ttm_bo_device *bdev, }EXPORT_SYMBOL (ttm_agp_unbind); -void ttm_agp_destroy (struct ttm_bo_device *bdev, -struct ttm_tt *ttm) +void ttm_agp_destroy (struct ttm_tt *ttm) { struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);if (agp_be->mem) -ttm_agp_unbind (bdev, ttm); +ttm_agp_unbind (ttm);ttm_tt_fini (ttm);kfree (agp_be); }
include/drm/ttm/ttm_tt.h +3 -6
@@ -264,12 +264,9 @@ void ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *ttm);struct ttm_tt *ttm_agp_tt_create (struct ttm_buffer_object *bo,struct agp_bridge_data *bridge,uint32_t page_flags); -int ttm_agp_bind (struct ttm_bo_device *bdev, -struct ttm_tt *ttm,struct ttm_resource *bo_mem); -void ttm_agp_unbind (struct ttm_bo_device *bdev, -struct ttm_tt *ttm); -void ttm_agp_destroy (struct ttm_bo_device *bdev, -struct ttm_tt *ttm); +int ttm_agp_bind (struct ttm_tt *ttm,struct ttm_resource *bo_mem); +void ttm_agp_unbind (struct ttm_tt *ttm); +void ttm_agp_destroy (struct ttm_tt *ttm);#endif #endif
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 13/13 drm/ttm: drop the tt backend function paths.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
These are now driver side.
--- drivers/gpu/drm/ttm/ttm_tt.c | 15 +++----------- include/drm/ttm/ttm_tt.h | 39 ------------------------------------ 2 files changed, 3 insertions(+), 51 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +3 -12
@@ -222,10 +222,7 @@ void ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *ttm)fput (ttm->swap_storage); ttm->swap_storage =NULL ; -if (bdev->driver->ttm_tt_destroy) - bdev->driver->ttm_tt_destroy (bdev, ttm); -else - ttm->func->destroy (bdev, ttm); + bdev->driver->ttm_tt_destroy (bdev, ttm); } static void ttm_tt_init_fields(struct ttm_tt *ttm,
@@ -313,10 +310,7 @@ EXPORT_SYMBOL(ttm_dma_tt_fini);void ttm_tt_unbind (struct ttm_bo_device *bdev,struct ttm_tt *ttm) {if (ttm->state == tt_bound) { -if (bdev->driver->ttm_tt_unbind) - bdev->driver->ttm_tt_unbind (bdev, ttm); -else - ttm->func->unbind (bdev, ttm); + bdev->driver->ttm_tt_unbind (bdev, ttm); ttm->state = tt_unbound; } }
@@ -337,10 +331,7 @@ int ttm_tt_bind(struct ttm_bo_device *bdev,if (ret)return ret; -if (bdev->driver->ttm_tt_bind) - ret = bdev->driver->ttm_tt_bind (bdev, ttm, bo_mem); -else - ret = ttm->func->bind (bdev, ttm, bo_mem); + ret = bdev->driver->ttm_tt_bind (bdev, ttm, bo_mem);if (unlikely (ret !=0 ))return ret;
include/drm/ttm/ttm_tt.h +0 -39
@@ -48,47 +48,9 @@ enum ttm_caching_state { tt_cached }; -struct ttm_backend_func { -/** -* struct ttm_backend_func member bind -* -* @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 (*bind) (struct ttm_bo_device *bdev,struct ttm_tt *ttm,struct ttm_resource *bo_mem); - -/** -* struct ttm_backend_func member unbind -* -* @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 (*unbind) (struct ttm_bo_device *bdev,struct ttm_tt *ttm); - -/** -* struct ttm_backend_func member destroy -* -* @ttm: Pointer to a struct ttm_tt. -* -* Destroy the backend. This will be call back from ttm_tt_destroy so -* don't call ttm_tt_destroy from the callback or infinite loop. -*/ -void (*destroy) (struct ttm_bo_device *bdev,struct ttm_tt *ttm); -}; -/** * struct ttm_tt * -* @func: Pointer to a struct ttm_backend_func that describes -* the backend methods. -* pointer. * @pages: Array of pages backing the data. * @num_pages: Number of pages in the page array. * @bdev: Pointer to the current struct ttm_bo_device.
@@ -102,7 +64,6 @@ struct ttm_backend_func {* memory. */ struct ttm_tt { -struct ttm_backend_func *func;struct page **pages;uint32_t page_flags;unsigned long num_pages;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 4 lines · Dave Airlie
Most of these have r-b or acks already, patch 1 I may have posted before but found in my tree, so reposting it, and patch 5 for radeon I think were what needed re-review.
R-b for ttm and nouveau changes, A-b for the other drivers.
Ben.
Quoted 10 lines
I'd like to land these, and I'll revisit the remainder of this series.
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel