This code was created specifically for the display handover, and can be removed now that we temporarily reserve the area of GGTT that contains the original framebuffer contents.
Signed-off-by: Maarten Lankhorst <[email protected]> --- drivers/gpu/drm/xe/xe_bo.c | 8 +------- drivers/gpu/drm/xe/xe_ggtt.c | 16 ---------------- drivers/gpu/drm/xe/xe_ggtt.h | 2 -- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c index c266fa6bade1b..5d7d91444dce3 100644 --- a/drivers/gpu/drm/xe/xe_bo.c +++ b/drivers/gpu/drm/xe/xe_bo.c @@ -2560,13 +2560,7 @@ __xe_bo_create_locked(struct xe_device *xe, if (t != tile && !(bo->flags & XE_BO_FLAG_GGTTx(t))) continue; - if (flags & XE_BO_FLAG_FIXED_PLACEMENT) { - err = xe_ggtt_insert_bo_at(t->mem.ggtt, bo, - start + xe_bo_size(bo), U64_MAX, - exec); - } else { - err = xe_ggtt_insert_bo(t->mem.ggtt, bo, exec); - } + err = xe_ggtt_insert_bo(t->mem.ggtt, bo, exec); if (err) goto err_unlock_put_bo; } diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c index ff479e0a9f3b3..017e7eeeb2c50 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.c +++ b/drivers/gpu/drm/xe/xe_ggtt.c @@ -900,22 +900,6 @@ static int __xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, return err; } -/** - * xe_ggtt_insert_bo_at - Insert BO at a specific GGTT space - * @ggtt: the &xe_ggtt where bo will be inserted - * @bo: the &xe_bo to be inserted - * @start: address where it will be inserted - * @end: end of the range where it will be inserted - * @exec: The drm_exec transaction to use for exhaustive eviction. - * - * Return: 0 on success or a negative error code on failure. - */ -int xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, - u64 start, u64 end, struct drm_exec *exec) -{ - return __xe_ggtt_insert_bo_at(ggtt, bo, start, end, exec); -} - /** * xe_ggtt_insert_bo - Insert BO into GGTT * @ggtt: the &xe_ggtt where bo will be inserted diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h index 83654544feb6d..02e72dbae0e58 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.h +++ b/drivers/gpu/drm/xe/xe_ggtt.h @@ -36,8 +36,6 @@ void xe_ggtt_node_remove_noclear(struct xe_ggtt_node *node); size_t xe_ggtt_node_pt_size(const struct xe_ggtt_node *node); void xe_ggtt_map_bo_unlocked(struct xe_ggtt *ggtt, struct xe_bo *bo); int xe_ggtt_insert_bo(struct xe_ggtt *ggtt, struct xe_bo *bo, struct drm_exec *exec); -int xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, - u64 start, u64 end, struct drm_exec *exec); void xe_ggtt_remove_bo(struct xe_ggtt *ggtt, struct xe_bo *bo); u64 xe_ggtt_largest_hole(struct xe_ggtt *ggtt, u64 alignment, u64 *spare); -- 2.53.0
